Merge branch 'maint-1.1'
dd98ee20bc9e
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Nov 26 2012, 17:31.

Description

Merge branch 'maint-1.1'

Conflicts:
modules/miscutil/sql/tabcreate.sql

Committed

Tibor Simko <tibor.simko@cern.ch>

Nov 26 2012, 17:31

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:dd98ee20bc9e: Merge branch 'maint-1.1' (authored by Tibor Simko <tibor.simko@cern.ch>).Nov 26 2012, 17:31

	Commit			Author	Details	Committed
	9be4dc932c56			Lars Holm Nielsen/Tibor Simko	installation: aidUSERINPUTLOG consistency upgrade	Nov 26 2012

				Path
	P			modules/miscutil/lib/upgrades/invenio_2012_11_21_aiduserinputlog_userid_check.py Copied from modules/miscutil/lib/upgrades/invenio_2012_10_29_idxINDEX_new_indexer_column.py
	M			modules/miscutil/sql/tabcreate.sql