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

Trivial merge