Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Thu, 8 Aug 2013 15:07:14 +0000 (17:07 +0200)
committerMarcel Werk <burntime@woltlab.com>
Thu, 8 Aug 2013 15:07:14 +0000 (17:07 +0200)

Trivial merge