Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Tue, 29 Jul 2014 11:21:59 +0000 (13:21 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 29 Jul 2014 11:21:59 +0000 (13:21 +0200)

Trivial merge