Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Mon, 6 Jul 2015 17:43:52 +0000 (19:43 +0200)
committerMarcel Werk <burntime@woltlab.com>
Mon, 6 Jul 2015 17:43:52 +0000 (19:43 +0200)

Trivial merge