Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Tue, 24 Sep 2013 09:31:59 +0000 (11:31 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 24 Sep 2013 09:31:59 +0000 (11:31 +0200)

Trivial merge