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

Trivial merge