Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Fri, 16 Sep 2011 17:45:25 +0000 (19:45 +0200)
committerMarcel Werk <burntime@woltlab.com>
Fri, 16 Sep 2011 17:45:25 +0000 (19:45 +0200)

Trivial merge