Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Sun, 14 Dec 2014 16:05:44 +0000 (17:05 +0100)
committerMarcel Werk <burntime@woltlab.com>
Sun, 14 Dec 2014 16:05:44 +0000 (17:05 +0100)

Trivial merge