Merge branch 'maint-1.0' into maint-1.1
9cc1ec0e466f
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Feb 18 2013, 21:58.

Description

Merge branch 'maint-1.0' into maint-1.1

Conflicts:
modules/bibupload/lib/bibupload_regression_tests.py

Committed

Tibor Simko <tibor.simko@cern.ch>

Feb 18 2013, 21:58

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:9cc1ec0e466f: Merge branch 'maint-1.0' into maint-1.1 (authored by Tibor Simko <tibor.simko@cern.ch>).Feb 18 2013, 21:58

	Commit			Author	Details	Committed
	28655e3726ec			Tibor Simko	BibUpload: FMT regression test case fix	Feb 18 2013

				Path
	M			modules/bibupload/lib/bibupload_regression_tests.py