Merge remote-tracking branch 'origin/master'
authorSascha Weinreuter <sascha.weinreuter@gmail.com>
Wed, 22 May 2013 09:11:12 +0000 (11:11 +0200)
committerSascha Weinreuter <sascha.weinreuter@gmail.com>
Wed, 22 May 2013 09:11:12 +0000 (11:11 +0200)

Trivial merge