Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Thu, 15 Jan 2015 16:26:10 +0000 (17:26 +0100)
committerMarcel Werk <burntime@woltlab.com>
Thu, 15 Jan 2015 16:26:10 +0000 (17:26 +0100)

Trivial merge