Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Mon, 13 Jul 2015 16:50:47 +0000 (18:50 +0200)
committerMarcel Werk <burntime@woltlab.com>
Mon, 13 Jul 2015 16:50:47 +0000 (18:50 +0200)

Trivial merge