Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Mon, 24 Feb 2014 22:28:46 +0000 (23:28 +0100)
committerMarcel Werk <burntime@woltlab.com>
Mon, 24 Feb 2014 22:28:46 +0000 (23:28 +0100)

Trivial merge