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

Trivial merge