Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Sun, 23 Oct 2011 21:52:35 +0000 (23:52 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sun, 23 Oct 2011 21:52:35 +0000 (23:52 +0200)

Trivial merge