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

Authored by Tibor Simko <tibor.simko@cern.ch> on May 6 2013, 11:37.

Description

Merge branch 'maint-1.0' into maint-1.1

Conflicts:
modules/miscutil/demo/democfgdata.sql
modules/miscutil/sql/tabfill.sql

Committed

Tibor Simko <tibor.simko@cern.ch>

May 6 2013, 11:37

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:eef86c865178: Merge branch 'maint-1.0' into maint-1.1 (authored by Tibor Simko <tibor.simko@cern.ch>).May 6 2013, 11:37

	Commit			Author	Details	Committed
	a73a40ca28ec			Tibor Simko	Merge branch 'maint-0.99' into maint-1.0	May 6 2013
	6f73a41f341c			Jiri Kuncar/Tibor Simko	installation: fix collectiondetailedrecordpagetabs	May 6 2013

				Path
	M			modules/miscutil/demo/democfgdata.sql
	M			modules/miscutil/sql/tabfill.sql