Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Tue, 9 Jul 2013 13:23:51 +0000 (15:23 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 9 Jul 2013 13:23:51 +0000 (15:23 +0200)

Trivial merge