Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Wed, 12 Oct 2011 18:13:39 +0000 (20:13 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 12 Oct 2011 18:13:39 +0000 (20:13 +0200)

Trivial merge