Merge branch 'maint-1.0' into maint-1.1
194f5a2569d6
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Oct 31 2012, 13:32.

Description

Merge branch 'maint-1.0' into maint-1.1

Conflicts:
Makefile.am
modules/bibcirculation/lib/bibcirculation_templates.py

Committed

Tibor Simko <tibor.simko@cern.ch>

Oct 31 2012, 14:04

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:194f5a2569d6: Merge branch 'maint-1.0' into maint-1.1 (authored by Tibor Simko <tibor.simko@cern.ch>).Oct 31 2012, 14:04

	Commit			Author	Details	Committed
	a0539af841c3			Tibor Simko	jQuery: tablesorter location standardisation	Oct 31 2012

				Path
	M			Makefile.am
	M			modules/bibcirculation/lib/bibcirculation_templates.py
	P			modules/miscutil/lib/upgrades/invenio_2012_10_31_tablesorter_location.py Copied from modules/websubmit/lib/functions/Create_Recid.py