Merge branch 'maint-1.0' into maint-1.1
83182926ce25
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Mar 3 2015, 21:24.

Description

Merge branch 'maint-1.0' into maint-1.1

Conflicts:
AUTHORS

Signed-off-by: Tibor Simko <tibor.simko@cern.ch>

Committed

Tibor Simko <tibor.simko@cern.ch>

Mar 3 2015, 21:24

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:83182926ce25: Merge branch 'maint-1.0' into maint-1.1 (authored by Tibor Simko <tibor.simko@cern.ch>).Mar 3 2015, 21:24

	Commit			Author	Details	Committed
	2e4ee8078ba0			Tibor Simko	docs: more complete list of past authors	Mar 3 2015

				Path
	M			AUTHORS