Merge remote-tracking branch 'kc/new/enh/bug_5922' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Mon, 1 Aug 2011 01:03:34 +0000 (13:03 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Mon, 1 Aug 2011 01:03:34 +0000 (13:03 +1200)
commit3195d20440eef3f3836a351a87ab50d7087534ec
tree4e60aff5e187b1fe440ee5e8c9f7433b975fa1fa
parent83e42b02858016f8ff53af668953e48cd6750e72
parent53daf8a2de25ef4e9c51c8316c4ec5d7760c234f
Merge remote-tracking branch 'kc/new/enh/bug_5922' into kcmaster
circ/returns.pl
koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt