Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Fri, 5 Jun 2015 13:26:17 +0000 (15:26 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 5 Jun 2015 13:26:17 +0000 (15:26 +0200)

Trivial merge