Merge branch 'master' into next
db557b012373
Actions

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

Description

Merge branch 'master' into next

Committed

Tibor Simko <tibor.simko@cern.ch>

Nov 26 2012, 14:52

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:db557b012373: Merge branch 'master' into next (authored by Tibor Simko <tibor.simko@cern.ch>).Nov 26 2012, 14:52

	Commit			Author	Details	Committed
	5850e2acd07f			Tibor Simko	Merge branch 'maint-1.1'	Nov 26 2012
	4dd717bb7f72			Samuele Kaplun/Tibor Simko	WebSession: fix for merge_usera_into_userb()	Nov 26 2012

				Path
	P			modules/miscutil/lib/upgrades/invenio_2012_11_01_lower_user_email.py Copied from modules/miscutil/lib/upgrades/invenio_2012_10_29_idxINDEX_new_indexer_column.py
	M			modules/websession/lib/webuser.py
	M			modules/websession/lib/webuser_config.py