Merge remote-tracking branch 'kc/new/bug_6755' into kcmaster
commit05be38d438c242496a5c205fffefcfbdfdb63d46
authorChris Cormack <chrisc@catalyst.net.nz>
Mon, 26 Sep 2011 10:26:45 +0000 (26 23:26 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 26 Sep 2011 10:27:20 +0000 (26 23:27 +1300)
tree34e4b5dd81daeb47a3d34f63d19856ea067e79ab
parentc5fe424c0f826a16caf3674b66df638d18bc6449
parent166f1668d83974f9728728d269136095395f5200
Merge remote-tracking branch 'kc/new/bug_6755' into kcmaster

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
C4/Templates.pm