Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Wed, 12 Oct 2011 19:42:03 +0000 (21:42 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 12 Oct 2011 19:42:03 +0000 (21:42 +0200)

Trivial merge