Merge branch 'master' into next
0d04426e55ff
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Feb 6 2013, 16:59.

Description

Merge branch 'master' into next

Conflicts:
modules/miscutil/lib/testutils.py

Committed

Tibor Simko <tibor.simko@cern.ch>

Feb 6 2013, 16:59

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:0d04426e55ff: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).Feb 6 2013, 16:59

	Commit			Author	Details	Committed
	34d522c2d3f1			Tibor Simko	Merge branch 'maint-1.1'	Feb 6 2013
	ea6cef9ddf58			Tibor Simko	global: test suite nosification	Feb 6 2013

				Path
	M			modules/bibclassify/lib/bibclassify_unit_tests.py
	M			modules/docextract/lib/refextract_unit_tests.py
	M			modules/miscutil/lib/solrutils_unit_tests.py
	M			modules/miscutil/lib/testutils.py
	M			modules/webaccess/lib/external_authentication_cern_unit_tests.py
	M			modules/webcomment/lib/webcomment_regression_tests.py
	M			modules/weblinkback/lib/weblinkback_regression_tests.py
	M			modules/websearch/lib/websearch_external_collections_unit_tests.py
	M			modules/websearch/lib/websearch_regression_tests.py
	M			modules/websubmit/lib/websubmit_regression_tests.py