Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Mon, 22 Sep 2014 14:46:02 +0000 (16:46 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 22 Sep 2014 14:46:02 +0000 (16:46 +0200)

Trivial merge