Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Mon, 4 Nov 2013 18:41:10 +0000 (19:41 +0100)
committerMarcel Werk <burntime@woltlab.com>
Mon, 4 Nov 2013 18:41:10 +0000 (19:41 +0100)

Trivial merge