Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Thu, 7 Nov 2013 21:42:40 +0000 (22:42 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 7 Nov 2013 21:42:40 +0000 (22:42 +0100)

Trivial merge