Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Wed, 11 Dec 2013 14:33:59 +0000 (15:33 +0100)
committerMarcel Werk <burntime@woltlab.com>
Wed, 11 Dec 2013 14:33:59 +0000 (15:33 +0100)

Trivial merge