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

Trivial merge