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)
1  2 
circ/circulation.pl
koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl

Simple merge