Merge branch 'maint-1.0' into maint-1.1
98f90fd13496
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Oct 18 2012, 11:44.

Description

Merge branch 'maint-1.0' into maint-1.1

Conflicts:
modules/websearch/lib/search_engine.py

Committed

Tibor Simko <tibor.simko@cern.ch>

Oct 18 2012, 11:44

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:98f90fd13496: Merge branch 'maint-1.0' into maint-1.1 (authored by Tibor Simko <tibor.simko@cern.ch>).Oct 18 2012, 11:44

	Commit			Author	Details	Committed
	3323a3fb39d8			Ludmila Marian/Tibor Simko	WebSearch: fix for webcoll	Oct 18 2012

				Path
	M			modules/websearch/lib/search_engine.py
	M			modules/websearch/lib/websearch_webcoll.py