Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Wed, 18 Feb 2015 11:18:13 +0000 (12:18 +0100)
committerMarcel Werk <burntime@woltlab.com>
Wed, 18 Feb 2015 11:18:13 +0000 (12:18 +0100)

Trivial merge