From: Chris Cormack <chrisc@catalyst.net.nz>
Date: Fri, 4 Feb 2011 00:23:46 +0000 (+1300)
Subject: Merge branch 'new/bug_5690' into kcmaster
X-Git-Tag: html_template_pro~416
X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=commitdiff_plain;h=ea93d3b56e4654530871e3c454251d16b9d5ce0e;p=koha-ffzg.git

Merge branch 'new/bug_5690' into kcmaster
---

ea93d3b56e4654530871e3c454251d16b9d5ce0e