From: Chris Cormack <chrisc@catalyst.net.nz>
Date: Mon, 1 Nov 2010 19:52:43 +0000 (+1300)
Subject: Merge remote branch 'galen/bug5308' into bug_5308
X-Git-Tag: html_template_pro~771^2
X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=commitdiff_plain;h=4e11a5ade37485a2822d7ce9682fbd84e4d6637b;p=koha_ffzg

Merge remote branch 'galen/bug5308' into bug_5308
---

4e11a5ade37485a2822d7ce9682fbd84e4d6637b