Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Mon, 8 Jul 2013 17:09:27 +0000 (19:09 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 8 Jul 2013 17:09:27 +0000 (19:09 +0200)

Trivial merge