projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e064aba 6e85ee6)
Merge remote-tracking branch 'kc/new/bug_5449' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Sun, 8 May 2011 20:25:36 +0000 (08:25 +1200)
committerChris Cormack <chrisc@catalyst.net.nz>
Sun, 8 May 2011 20:25:36 +0000 (08:25 +1200)
1  2 
tools/manage-marc-import.pl patch | diff1 | diff2 | blob | history
tools/stage-marc-import.pl patch | diff1 | diff2 | blob | history

diff --cc tools/manage-marc-import.pl
Simple merge
diff --cc tools/stage-marc-import.pl
Simple merge
Koha ILS @ FFZG - based on git://git.koha.org/pub/scm/koha.git