From: Chris Cormack <chrisc@catalyst.net.nz>
Date: Tue, 19 Apr 2011 18:44:09 +0000 (+1200)
Subject: Merge remote branch 'kc/master' into new/enh/bug_5579
X-Git-Tag: v3.04.00~31^2~3
X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=commitdiff_plain;h=c2043933f7f9b30bf87a4c5656c50fd10584ef4f;p=srvgit

Merge remote branch 'kc/master' into new/enh/bug_5579
---

c2043933f7f9b30bf87a4c5656c50fd10584ef4f