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

Trivial merge