Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Tue, 26 Jul 2011 15:58:38 +0000 (17:58 +0200)
committerMarcel Werk <burntime@woltlab.com>
Tue, 26 Jul 2011 15:58:38 +0000 (17:58 +0200)

Trivial merge