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

Trivial merge