Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Mon, 16 Jul 2012 22:21:14 +0000 (00:21 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 16 Jul 2012 22:21:14 +0000 (00:21 +0200)

Trivial merge