Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Mon, 28 Apr 2014 13:20:55 +0000 (15:20 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 28 Apr 2014 13:20:55 +0000 (15:20 +0200)

Trivial merge