Merge branch 'maint-1.1'
d7a61134876e
Actions

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

Description

Merge branch 'maint-1.1'

Conflicts:
modules/bibcirculation/lib/bibcirculation_templates.py

Committed

Tibor Simko <tibor.simko@cern.ch>

Oct 31 2012, 15:06

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:d7a61134876e: Merge branch 'maint-1.1' (authored by Tibor Simko <tibor.simko@cern.ch>).Oct 31 2012, 15:06

	Commit			Author	Details	Committed
	194f5a2569d6			Tibor Simko	Merge branch 'maint-1.0' into maint-1.1	Oct 31 2012
	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/miscutil/lib/upgrades/invenio_2012_10_29_idxINDEX_new_indexer_column.py