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)

Trivial merge