Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Mon, 22 Jul 2013 12:38:51 +0000 (14:38 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 22 Jul 2013 12:38:51 +0000 (14:38 +0200)

Trivial merge