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

Trivial merge