Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Thu, 25 Oct 2012 15:30:09 +0000 (17:30 +0200)
committerMarcel Werk <burntime@woltlab.com>
Thu, 25 Oct 2012 15:30:09 +0000 (17:30 +0200)

Trivial merge