Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Thu, 27 Aug 2015 14:16:30 +0000 (16:16 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 27 Aug 2015 14:16:30 +0000 (16:16 +0200)

Trivial merge