Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sun, 11 Aug 2013 16:33:01 +0000 (18:33 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 11 Aug 2013 16:33:01 +0000 (18:33 +0200)

Trivial merge