Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Mon, 25 Nov 2013 14:31:04 +0000 (15:31 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 25 Nov 2013 14:31:04 +0000 (15:31 +0100)

Trivial merge