Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Mon, 17 Dec 2012 17:13:43 +0000 (18:13 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 17 Dec 2012 17:13:43 +0000 (18:13 +0100)

Trivial merge