From: Chris Cormack <chrisc@catalyst.net.nz>
Date: Mon, 14 Mar 2011 21:04:38 +0000 (+1300)
Subject: Merge remote branch 'kc/new/bug_5693' into kcmaster
X-Git-Tag: html_template_pro~280
X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=commitdiff_plain;h=fc2fe083fcc34742a1f80e3fb3df1ab4bd072ca1;p=koha_fer

Merge remote branch 'kc/new/bug_5693' into kcmaster
---

fc2fe083fcc34742a1f80e3fb3df1ab4bd072ca1