Merge branch 'maint-1.0' into maint-1.1
521a0ee4535a
Actions

Authored by Tibor Simko <tibor.simko@cern.ch> on Jan 15 2015, 18:05.

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>

Jan 15 2015, 18:07

Parents

Branches

Unknown

Tags

Unknown

Tibor Simko <tibor.simko@cern.ch> committed R3600:521a0ee4535a: Merge branch 'maint-1.0' into maint-1.1 (authored by Tibor Simko <tibor.simko@cern.ch>).Jan 15 2015, 18:07

	Commit			Author	Details	Committed
	577632fca777			Tibor Simko	installation: disable SSLv2/SSLv3 in Apache config	Jan 15 2015

				Path
	M			modules/miscutil/lib/inveniocfg.py