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

Authored by Tibor Simko <tibor.simko@cern.ch> on Aug 12 2013, 10:47.

Description

Merge branch 'maint-1.0' into maint-1.1

Conflicts:
modules/miscutil/lib/inveniocfg.py

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

Committed

Tibor Simko <tibor.simko@cern.ch>

Aug 12 2013, 10:55

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:ada92a2850ff: Merge branch 'maint-1.0' into maint-1.1 (authored by Tibor Simko <tibor.simko@cern.ch>).Aug 12 2013, 10:55

	Commit			Author	Details	Committed
	06561b709639			Samuele Kaplun/Tibor Simko	installation: support for Apache-2.4	Aug 12 2013

				Path
	M			modules/miscutil/lib/inveniocfg.py