Merge branch 'master' into next
9dd7cb26c976
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on May 27 2013, 13:26.

Description

Merge branch 'master' into next

Committed

Tibor Simko <tibor.simko@cern.ch>

May 27 2013, 13:26

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:9dd7cb26c976: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).May 27 2013, 13:26

	Commit			Author	Details	Committed
	8d50a165fb6b			Esteban J. G. Gabancho/Tibor Simko	BibField: fix for lxml compatibility	May 27 2013
	df7fc577df46			Esteban J. G. Gabancho/Tibor Simko	BibField: Python-2.4 compliance	May 22 2013

				Path
	M			modules/bibfield/etc/atlantis.cfg
	M			modules/bibfield/lib/bibfield_jsonreader.py
	M			modules/bibfield/lib/bibfield_marcreader.py
	M			modules/bibfield/lib/bibfield_marcreader_regression_tests.py
	M			modules/bibfield/lib/bibfield_regression_tests.py
	M			modules/bibfield/lib/bibfield_utils.py
	M			modules/bibfield/lib/bibfield_utils_unit_tests.py