Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Mon, 30 Jun 2014 19:41:51 +0000 (21:41 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 30 Jun 2014 19:41:51 +0000 (21:41 +0200)

Trivial merge