Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sun, 10 Aug 2014 22:36:09 +0000 (00:36 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 10 Aug 2014 22:36:09 +0000 (00:36 +0200)

Trivial merge