Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sat, 11 Oct 2014 10:25:49 +0000 (12:25 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 11 Oct 2014 10:25:49 +0000 (12:25 +0200)

Trivial merge