Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Sat, 22 Oct 2011 18:32:33 +0000 (20:32 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sat, 22 Oct 2011 18:32:33 +0000 (20:32 +0200)

Trivial merge