Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sat, 21 Dec 2013 20:37:51 +0000 (21:37 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 21 Dec 2013 20:37:51 +0000 (21:37 +0100)

Trivial merge