Merge remote branch 'kc/new/enh/bug_3495' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Tue, 15 Mar 2011 09:01:45 +0000 (22:01 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Tue, 15 Mar 2011 09:01:45 +0000 (22:01 +1300)
commit1e98195b1014f9b0680be9d6ea9e8e8132821158
tree40ee44226183c37da27d0c7fc6b7d4d1a1c03aac
parent5a924cc530658f3ab11cf1a219fd9ba4e602f1e5
parent9dfc9d4d12c371a08086c753b76c881d67508610
Merge remote branch 'kc/new/enh/bug_3495' into kcmaster
circ/circulation.pl
koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl