Merge remote branch 'kc/new/enh/bug_2965' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Mon, 20 Dec 2010 19:51:31 +0000 (08:51 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 20 Dec 2010 19:51:31 +0000 (08:51 +1300)
commit9693db7bff0e900680e388c24e7920ce703f4419
treeaedbca0921a21cc1841bd7e872ba86b04ab1a17e
parent9e9d8dbe2ce8544c111cff7ba7b687fd658ac6fa
parentcf4d8519078cf13ff2e67c7baca39f3fb95897a8
Merge remote branch 'kc/new/enh/bug_2965' into kcmaster
koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl