Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Thu, 1 Aug 2013 16:06:43 +0000 (18:06 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 1 Aug 2013 16:06:43 +0000 (18:06 +0200)

Trivial merge