Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Mon, 12 Aug 2013 14:35:10 +0000 (16:35 +0200)
committerMarcel Werk <burntime@woltlab.com>
Mon, 12 Aug 2013 14:35:10 +0000 (16:35 +0200)

Trivial merge