Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Thu, 11 Jul 2013 20:06:29 +0000 (22:06 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 11 Jul 2013 20:06:29 +0000 (22:06 +0200)

Trivial merge