Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Tue, 23 Dec 2014 18:38:15 +0000 (19:38 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 23 Dec 2014 18:38:15 +0000 (19:38 +0100)

Trivial merge