Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Thu, 30 Jan 2014 20:48:32 +0000 (21:48 +0100)
committerMarcel Werk <burntime@woltlab.com>
Thu, 30 Jan 2014 20:48:32 +0000 (21:48 +0100)

Trivial merge