Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Thu, 11 Apr 2013 15:03:34 +0000 (17:03 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 11 Apr 2013 15:03:34 +0000 (17:03 +0200)

Trivial merge