Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Mon, 14 Oct 2013 22:43:28 +0000 (00:43 +0200)
committerMarcel Werk <burntime@woltlab.com>
Mon, 14 Oct 2013 22:43:28 +0000 (00:43 +0200)

Trivial merge