Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Fri, 5 Apr 2013 23:36:29 +0000 (01:36 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 5 Apr 2013 23:36:29 +0000 (01:36 +0200)

Trivial merge