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

Trivial merge