Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Thu, 3 Oct 2013 13:06:57 +0000 (15:06 +0200)
committerMarcel Werk <burntime@woltlab.com>
Thu, 3 Oct 2013 13:06:57 +0000 (15:06 +0200)

Trivial merge