From: Chris Cormack <chrisc@catalyst.net.nz>
Date: Thu, 20 Jan 2011 08:06:23 +0000 (+1300)
Subject: Merge remote branch 'kc/new/enh/bug_5640' into kcmaster
X-Git-Tag: html_template_pro~460
X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=commitdiff_plain;h=c0f712fa184adc51296c2e1fecf26caa2bee4e14;p=koha-ffzg.git

Merge remote branch 'kc/new/enh/bug_5640' into kcmaster
---

c0f712fa184adc51296c2e1fecf26caa2bee4e14