Merge branch 'master' into next
a28c05d4f50d
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Apr 8 2013, 17:58.

Description

Merge branch 'master' into next

master: importutils: Python 2.4 support and test case importutils: initial release

Merge note: changed webinterface_handler_flask to use related_name_re instead of _glob as per Lars's updates.

Conflicts:
modules/miscutil/lib/Makefile.am
modules/miscutil/lib/importutils.py

Committed

Tibor Simko <tibor.simko@cern.ch>

Apr 8 2013, 18:00

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:a28c05d4f50d: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).Apr 8 2013, 18:00

	Commit			Author	Details	Committed
	f53b431c4ff4			Lars Holm Nielsen/Tibor Simko	importutils: Python 2.4 support and test case	Apr 8 2013
	9f2bc11a33bb			Lars Holm Nielsen/Tibor Simko	importutils: initial release	Apr 8 2013

				Path
	M			modules/miscutil/lib/Makefile.am
	M			modules/miscutil/lib/importutils.py
	P			modules/miscutil/lib/importutils_unit_tests.py Copied from modules/websearch/lib/search_engine_summarizer_regression_tests.py
	M			modules/webstyle/lib/webinterface_handler_flask.py