Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Thu, 5 Apr 2012 18:44:06 +0000 (20:44 +0200)
committerMarcel Werk <burntime@woltlab.com>
Thu, 5 Apr 2012 18:44:06 +0000 (20:44 +0200)

Trivial merge