Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Thu, 14 Mar 2013 15:51:52 +0000 (16:51 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 14 Mar 2013 15:51:52 +0000 (16:51 +0100)

Trivial merge