Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Fri, 6 Mar 2015 18:42:29 +0000 (19:42 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 6 Mar 2015 18:42:29 +0000 (19:42 +0100)

Trivial merge