Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Fri, 14 Oct 2011 19:32:13 +0000 (21:32 +0200)
committerMarcel Werk <burntime@woltlab.com>
Fri, 14 Oct 2011 19:32:13 +0000 (21:32 +0200)

Trivial merge