Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sat, 27 Jul 2013 12:55:31 +0000 (14:55 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 27 Jul 2013 12:55:31 +0000 (14:55 +0200)

Trivial merge