Merge branch 'maint-1.0' into maint-1.1
cc702f64e00e
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Feb 26 2013, 14:29.

Description

Merge branch 'maint-1.0' into maint-1.1

Conflicts:
Makefile.am
modules/webaccess/lib/external_authentication_robot.py

Committed

Tibor Simko <tibor.simko@cern.ch>

Feb 26 2013, 14:29

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:cc702f64e00e: Merge branch 'maint-1.0' into maint-1.1 (authored by Tibor Simko <tibor.simko@cern.ch>).Feb 26 2013, 14:29

	Commit			Author	Details	Committed
	45fc2121fe43			Tibor Simko	WebAccess: replacement of CDS Invenio by InveniO	Feb 26 2013

				Path
	M			Makefile.am
	M			modules/webaccess/lib/external_authentication_robot.py