Merge branch 'maint-1.1'
4e9c0c85d734
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Dec 21 2012, 12:29.

Description

Merge branch 'maint-1.1'

Conflicts:
modules/bibcirculation/lib/bibcirculation_webinterface.py

Committed

Tibor Simko <tibor.simko@cern.ch>

Dec 21 2012, 12:30

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:4e9c0c85d734: Merge branch 'maint-1.1' (authored by Tibor Simko <tibor.simko@cern.ch>).Dec 21 2012, 12:30

	Commit			Author	Details	Committed
	422d4678bf65			Jerome Caffaro/Tibor Simko	global: login link using absolute URL redirection	Dec 21 2012

				Path
	M			modules/bibcirculation/lib/bibcirculation_webinterface.py
	M			modules/webbasket/lib/webbasket_webinterface.py
	M			modules/webcomment/lib/webcomment_webinterface.py
	M			modules/weblinkback/lib/weblinkback_webinterface.py
	M			modules/websession/lib/websession_templates.py
	M			modules/websession/lib/websession_webinterface.py