Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Mon, 10 Feb 2014 23:20:58 +0000 (00:20 +0100)
committerMarcel Werk <burntime@woltlab.com>
Mon, 10 Feb 2014 23:20:58 +0000 (00:20 +0100)

Trivial merge