Merge branch 'master' of github.com:WoltLab/WCF 2.1.6
authorAlexander Ebert <ebert@woltlab.com>
Thu, 23 Jul 2015 14:18:06 +0000 (16:18 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 23 Jul 2015 14:18:06 +0000 (16:18 +0200)

Trivial merge