Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Thu, 27 Feb 2014 19:16:14 +0000 (20:16 +0100)
committerMarcel Werk <burntime@woltlab.com>
Thu, 27 Feb 2014 19:16:14 +0000 (20:16 +0100)

Trivial merge