Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Tue, 10 Sep 2013 22:00:06 +0000 (00:00 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 10 Sep 2013 22:00:06 +0000 (00:00 +0200)

Trivial merge