Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Mon, 13 May 2013 17:49:35 +0000 (19:49 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 13 May 2013 17:49:35 +0000 (19:49 +0200)

Trivial merge