Merge remote branch 'magnus/bug3644-normarc' into new/pending_qa/enh/bug_3644
authorChris Cormack <chrisc@catalyst.net.nz>
Sat, 2 Apr 2011 06:46:30 +0000 (19:46 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Sat, 2 Apr 2011 06:46:30 +0000 (19:46 +1300)
commit228587f19b25406f8a2ee76827524ef3fc921a77
tree7a7e08468e88491ee1c5bd76c1612a54526cbb67
parent9624644860039ff349fb60000a67ed03da86a78b
parentedf8ad5d5da9c11e0dc61c1df40ce977e9e6a125
Merge remote branch 'magnus/bug3644-normarc' into new/pending_qa/enh/bug_3644
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref