Merge remote-tracking branch 'origin/master'
authorSascha Weinreuter <sascha.weinreuter@gmail.com>
Wed, 19 Dec 2012 09:34:40 +0000 (10:34 +0100)
committerSascha Weinreuter <sascha.weinreuter@gmail.com>
Wed, 19 Dec 2012 09:34:40 +0000 (10:34 +0100)
commitf8c0bc660b0411f22295ce39d0a799436a12aa6e
treea0ab0c189584d691f15516dfa1a0f6295c70e385
parentb49eb3f2eee48f9b68a2915f75854a44e2c6b5f7
parent4003bd1690e834ddeb991bfdee08e47ed7408007
Merge remote-tracking branch 'origin/master'