Merge branch 'maint-1.0' into maint-1.1
4b91292219ea
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Sep 11 2013, 16:54.

Description

Merge branch 'maint-1.0' into maint-1.1

Conflicts:
RELEASE-NOTES
modules/websearch/lib/search_engine.py
modules/websearch/lib/search_engine_unit_tests.py

Signed-off-by: Tibor Simko <tibor.simko@cern.ch>

Committed

Tibor Simko <tibor.simko@cern.ch>

Sep 11 2013, 16:54

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:4b91292219ea: Merge branch 'maint-1.0' into maint-1.1 (authored by Tibor Simko <tibor.simko@cern.ch>).Sep 11 2013, 16:54

	Commit			Author	Details	Committed
	15fdcaf87875			Tibor Simko	WebSearch: asciification of `oe` grapheme	Sep 11 2013

				Path
	M			RELEASE-NOTES
	M			modules/miscutil/lib/textutils.py
	M			modules/miscutil/lib/textutils_unit_tests.py
	M			modules/websearch/lib/search_engine_unit_tests.py