Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Fri, 3 May 2013 20:25:56 +0000 (22:25 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 3 May 2013 20:25:56 +0000 (22:25 +0200)

Trivial merge