Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Thu, 16 May 2013 13:11:58 +0000 (15:11 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 16 May 2013 13:11:58 +0000 (15:11 +0200)

Trivial merge