Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Thu, 21 Nov 2013 19:05:39 +0000 (20:05 +0100)
committerMarcel Werk <burntime@woltlab.com>
Thu, 21 Nov 2013 19:05:39 +0000 (20:05 +0100)

Trivial merge