Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Thu, 4 Dec 2014 19:37:15 +0000 (20:37 +0100)
committerMarcel Werk <burntime@woltlab.com>
Thu, 4 Dec 2014 19:37:15 +0000 (20:37 +0100)

Trivial merge