Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Fri, 12 Jul 2013 23:23:18 +0000 (01:23 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Fri, 12 Jul 2013 23:23:18 +0000 (01:23 +0200)

Trivial merge