]> git.koha-community.org Git - koha.git/commit
Merge remote branch 'kc/master' into new/bug_5105
authorChris Cormack <chrisc@catalyst.net.nz>
Wed, 10 Nov 2010 22:33:10 +0000 (11:33 +1300)
committerChris Nighswonger <chris.nighswonger@gmail.com>
Wed, 10 Nov 2010 23:04:39 +0000 (18:04 -0500)
commitb2af1f850daa1dc041e109d8a51fedbf4b03c7bf
treeee81986fa507ee3d141541200a4f3a63990c529f
parent740070ab789846e7e13cbc2d64e20d918cd00426
Merge remote branch 'kc/master' into new/bug_5105

Conflict fixed

Conflicts:
opac/opac-detail.pl
(cherry picked from commit dcb86689f73089ceaa789a92c34e78200d05af61)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
C4/Reports/Guided.pm
basket/downloadcart.pl
opac/opac-detail.pl
opac/opac-downloadcart.pl
opac/opac-downloadshelf.pl
tools/batchMod.pl
virtualshelves/downloadshelf.pl