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

Trivial merge