Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Mon, 2 Jul 2012 13:56:55 +0000 (15:56 +0200)
committerMarcel Werk <burntime@woltlab.com>
Mon, 2 Jul 2012 13:56:55 +0000 (15:56 +0200)

Trivial merge