Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sat, 10 Aug 2013 13:38:32 +0000 (15:38 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sat, 10 Aug 2013 13:38:32 +0000 (15:38 +0200)

Trivial merge