Merge branch 'maint-1.1'
4a2fefdd9083
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Feb 20 2013, 06:51.

Description

Merge branch 'maint-1.1'

Conflicts:
modules/websearch/lib/websearch_regression_tests.py

Committed

Tibor Simko <tibor.simko@cern.ch>

Feb 20 2013, 06:51

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:4a2fefdd9083: Merge branch 'maint-1.1' (authored by Tibor Simko <tibor.simko@cern.ch>).Feb 20 2013, 06:51

	Commit			Author	Details	Committed
	c5886bd6633f			Samuele Kaplun/Tibor Simko	BibFormat: setUp/tearDown in unit tests	Feb 20 2013

				Path
	M			modules/bibformat/lib/bibformat_engine_unit_tests.py
	M			modules/websearch/lib/websearch_regression_tests.py