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

Authored by kuncar on Mar 23 2015, 23:50.

Description

Merge branch 'maint-1.0' into maint-1.1

Signed-off-by: Jiri Kuncar <jiri.kuncar@cern.ch>

Conflicts:
modules/miscutil/lib/inveniocfg.py

Committed

kuncar

Mar 23 2015, 23:51

Parents

Branches

Unknown

Tags

Unknown

Jiri Kuncar <jiri.kuncar@cern.ch> committed R3600:d9f089c7fa10: Merge branch 'maint-1.0' into maint-1.1 (authored by Jiri Kuncar <jiri.kuncar@cern.ch>).Mar 23 2015, 23:51

	Commit			Author	Details	Committed
	880ae3d2b436			Tibor Simko	installation: Python path in Apache virtual hosts	Mar 23 2015

				Path
	M			modules/miscutil/lib/inveniocfg.py