Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Fri, 27 Sep 2013 16:07:15 +0000 (18:07 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 27 Sep 2013 16:07:15 +0000 (18:07 +0200)

Trivial merge