Merge remote-tracking branch 'origin/master'
authorSascha Weinreuter <sascha.weinreuter@gmail.com>
Mon, 21 Jan 2013 08:07:12 +0000 (09:07 +0100)
committerSascha Weinreuter <sascha.weinreuter@gmail.com>
Mon, 21 Jan 2013 08:07:12 +0000 (09:07 +0100)

Trivial merge