Merge pull request #587 from Siora/templateFixes
authorMarcel Werk <burntime@woltlab.com>
Wed, 9 May 2012 11:32:16 +0000 (04:32 -0700)
committerMarcel Werk <burntime@woltlab.com>
Wed, 9 May 2012 11:32:16 +0000 (04:32 -0700)
some acp template fixes


Trivial merge