Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sat, 13 Jul 2013 18:21:59 +0000 (20:21 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 13 Jul 2013 18:21:59 +0000 (20:21 +0200)

Trivial merge