projects / koha.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f0fc240 12ac5e3)
Merge remote branch 'kc/new/for-3.4/enh_bulkmarcimport' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Tue, 2 Nov 2010 01:38:52 +0000 (14:38 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Tue, 2 Nov 2010 01:38:52 +0000 (14:38 +1300)

Trivial merge
Koha ILS @ FFZG - based on git://git.koha.org/pub/scm/koha.git