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

Trivial merge