Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sat, 7 Mar 2015 00:00:37 +0000 (01:00 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 7 Mar 2015 00:00:37 +0000 (01:00 +0100)

Trivial merge