Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sun, 23 Nov 2014 12:57:07 +0000 (13:57 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 23 Nov 2014 12:57:07 +0000 (13:57 +0100)

Trivial merge