Merge remote-tracking branch 'kc/new/enh/bug_5922' into kcmaster

author Chris Cormack <chrisc@catalyst.net.nz>

Mon, 1 Aug 2011 01:03:34 +0000 (13:03 +1200)

committer Chris Cormack <chrisc@catalyst.net.nz>

Mon, 1 Aug 2011 01:03:34 +0000 (13:03 +1200)
author Chris Cormack <chrisc@catalyst.net.nz>
Mon, 1 Aug 2011 01:03:34 +0000 (13:03 +1200)
committer Chris Cormack <chrisc@catalyst.net.nz>
Mon, 1 Aug 2011 01:03:34 +0000 (13:03 +1200)
diff --cc circ/returns.pl
Simple merge
diff --cc koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
Simple merge
author	Chris Cormack <chrisc@catalyst.net.nz>
	Mon, 1 Aug 2011 01:03:34 +0000 (13:03 +1200)
committer	Chris Cormack <chrisc@catalyst.net.nz>
	Mon, 1 Aug 2011 01:03:34 +0000 (13:03 +1200)
		1	2
circ/returns.pl	patch \|	diff1 \|	diff2 \|	blob \| history
koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt	patch \|	diff1 \|	diff2 \|	blob \| history