Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Tue, 14 Apr 2015 11:01:37 +0000 (13:01 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 14 Apr 2015 11:01:37 +0000 (13:01 +0200)

Trivial merge