Merge branch 'maint-1.0' into master
12ab5e1f38c8
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Feb 14 2012, 09:48.

Description

Merge branch 'maint-1.0' into master

Conflicts:
modules/webcomment/lib/webcomment.py
modules/webcomment/lib/webcomment_webinterface.py

Committed

Tibor Simko <tibor.simko@cern.ch>

Feb 14 2012, 09:49

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:12ab5e1f38c8: Merge branch 'maint-1.0' into master (authored by Tibor Simko <tibor.simko@cern.ch>).Feb 14 2012, 09:49

	Commit			Author	Details	Committed
	dbded6f661fc			Jerome Caffaro/Tibor Simko	WebComment: improve sanity checks	Feb 13 2012

				Path
	M			modules/webcomment/lib/webcomment.py
	M			modules/webcomment/lib/webcomment_regression_tests.py
	M			modules/webcomment/lib/webcomment_webinterface.py