Merge branch 'maint-1.0'
02b4b71dc839
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Feb 29 2012, 14:55.

Description

Merge branch 'maint-1.0'

maint-1.0: BibHarvest: optional JSON dependency WebHelp: HOWTO MARC document update textmarc2xmlmarc: fix handling of BOM BibIndex: Greek stemmer improvements

Conflicts:
modules/bibharvest/web/admin/oaiharvestadmin.py
modules/webhelp/web/admin/howto/howto-marc.webdoc

Committed

Tibor Simko <tibor.simko@cern.ch>

Feb 29 2012, 14:55

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:02b4b71dc839: Merge branch 'maint-1.0' (authored by Tibor Simko <tibor.simko@cern.ch>).Feb 29 2012, 14:55

Commit	Author	Details	Committed
df2a1ec0aee6	Tibor Simko	BibHarvest: optional JSON dependency	Feb 29 2012
48529d324705	Annette Holtkamp/Tibor Simko	WebHelp: HOWTO MARC document update	Feb 29 2012
4a770d280caf	Samuele Kaplun/Tibor Simko	textmarc2xmlmarc: fix handling of BOM	Feb 29 2012
7c269a177e75	Nikolaos Kasioumis/Tibor Simko	BibIndex: Greek stemmer improvements	Feb 29 2012

				Path
	M			modules/bibedit/lib/textmarc2xmlmarc.py
	M			modules/bibharvest/web/admin/oaiharvestadmin.py
	M			modules/bibindex/lib/bibindex_engine_stemmer.py
	M			modules/bibindex/lib/bibindex_engine_stemmer_greek.py
	M			modules/webhelp/web/admin/howto/howto-marc.webdoc