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

Trivial merge