Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Thu, 28 Jun 2012 18:27:46 +0000 (20:27 +0200)
committerMarcel Werk <burntime@woltlab.com>
Thu, 28 Jun 2012 18:27:46 +0000 (20:27 +0200)

Trivial merge