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

Trivial merge