Merge branch 'master' of /home/jmf/repos/koha-rm-root.git/
authorChris Cormack <crc@liblime.com>
Wed, 8 Aug 2007 12:36:43 +0000 (07:36 -0500)
committerChris Cormack <crc@liblime.com>
Wed, 8 Aug 2007 12:36:43 +0000 (07:36 -0500)
commit2e4a11773c0a4aa172b5debdee4db831a13adf26
treebbee20363731ddb936a4daf56ec30b72817ac7f1
parenta1175974323c6299658482c04549f9e4aead5167
parent8ee881174fbb75e983e9ea09f70b2fcecee396ab
Merge branch 'master' of /home/jmf/repos/koha-rm-root.git/
koha-tmpl/intranet-tmpl/prog/en/cataloguing/z3950_search.tmpl
koha-tmpl/intranet-tmpl/prog/en/serials/subscription-add.tmpl
misc/zebra/ccl.properties