Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Mon, 20 May 2013 21:47:18 +0000 (23:47 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 20 May 2013 21:47:18 +0000 (23:47 +0200)

Trivial merge