Merge branch 'maint-1.0' into bbb
03997cac46d1
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Aug 8 2012, 14:14.

Description

Merge branch 'maint-1.0' into bbb

Conflicts:
modules/websearch/doc/hacking/search-engine-api.webdoc
modules/websearch/lib/search_engine.py

Committed

Tibor Simko <tibor.simko@cern.ch>

Aug 8 2012, 14:15

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:03997cac46d1: Merge branch 'maint-1.0' into bbb (authored by Tibor Simko <tibor.simko@cern.ch>).Aug 8 2012, 14:15

	Commit			Author	Details	Committed
	194cf2430ba7			Tibor Simko	WebSearch: more uses of `rg` configurable default	Aug 8 2012

				Path
	M			modules/websearch/doc/hacking/search-engine-api.webdoc
	M			modules/websearch/lib/search_engine.py