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

Trivial merge