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

Trivial merge