Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Thu, 8 Aug 2013 11:04:32 +0000 (13:04 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 8 Aug 2013 11:04:32 +0000 (13:04 +0200)

Trivial merge