Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Mon, 5 Aug 2013 13:30:22 +0000 (15:30 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Mon, 5 Aug 2013 13:30:22 +0000 (15:30 +0200)

Trivial merge