Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Mon, 19 Jan 2015 00:29:03 +0000 (01:29 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 19 Jan 2015 00:29:03 +0000 (01:29 +0100)

Trivial merge