Merge branch 'maint-1.0' into maint-1.1
1cbf4a8729dd
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Nov 21 2012, 17:56.

Description

Merge branch 'maint-1.0' into maint-1.1

Conflicts:
modules/bibupload/lib/batchuploader_engine.py

Committed

Tibor Simko <tibor.simko@cern.ch>

Nov 21 2012, 17:57

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:1cbf4a8729dd: Merge branch 'maint-1.0' into maint-1.1 (authored by Tibor Simko <tibor.simko@cern.ch>).Nov 21 2012, 17:57

	Commit			Author	Details	Committed
	be75573cf9a9			Samuele Kaplun/Tibor Simko	BatchUploader: error reporting improvements	Nov 21 2012

				Path
	M			modules/bibupload/lib/batchuploader_engine.py