Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Wed, 9 Jul 2014 15:01:37 +0000 (17:01 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 9 Jul 2014 15:01:37 +0000 (17:01 +0200)

Trivial merge