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

Trivial merge