Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sun, 27 Jan 2013 15:33:58 +0000 (16:33 +0100)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 27 Jan 2013 15:33:58 +0000 (16:33 +0100)

Trivial merge