Merge branch 'master' into badges
authorJan D. Behrens <zykure@web.de>
Sun, 16 Sep 2012 20:26:00 +0000 (22:26 +0200)
committerJan D. Behrens <zykure@web.de>
Sun, 16 Sep 2012 20:26:00 +0000 (22:26 +0200)

Trivial merge