Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Mon, 23 Dec 2013 15:41:35 +0000 (16:41 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 23 Dec 2013 15:41:35 +0000 (16:41 +0100)

Trivial merge