Merge branch 'maint-1.1'
d8ec45e0dfc3
Actions

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

Description

Merge branch 'maint-1.1'

Conflicts:
modules/websearch/lib/search_engine.py
modules/websearch/lib/websearch_regression_tests.py

Committed

Tibor Simko <tibor.simko@cern.ch>

Mar 11 2013, 16:09

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:d8ec45e0dfc3: Merge branch 'maint-1.1' (authored by Tibor Simko <tibor.simko@cern.ch>).Mar 11 2013, 16:09

	Commit			Author	Details	Committed
	5f8a1e854043			Grzegorz Szpura/Tibor Simko	WebSearch: nicer browsing of fuzzy indexes	Mar 11 2013

				Path
	M			modules/websearch/lib/search_engine.py
	M			modules/websearch/lib/websearch_regression_tests.py
	M			modules/websearch/lib/websearch_templates.py