Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sat, 18 Apr 2015 12:37:33 +0000 (14:37 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 18 Apr 2015 12:37:33 +0000 (14:37 +0200)

Trivial merge