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

Trivial merge