Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sun, 5 May 2013 21:31:13 +0000 (23:31 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 5 May 2013 21:31:13 +0000 (23:31 +0200)

Trivial merge