Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Fri, 20 Dec 2013 00:28:19 +0000 (01:28 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 20 Dec 2013 00:28:19 +0000 (01:28 +0100)

Trivial merge