Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Mon, 14 Jan 2013 22:48:29 +0000 (23:48 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 14 Jan 2013 22:48:29 +0000 (23:48 +0100)

Trivial merge