Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sun, 21 Jul 2013 15:26:39 +0000 (17:26 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 21 Jul 2013 15:26:39 +0000 (17:26 +0200)

Trivial merge