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

Trivial merge