Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sat, 13 Dec 2014 00:54:27 +0000 (01:54 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 13 Dec 2014 00:54:27 +0000 (01:54 +0100)

Trivial merge