Todd Gamblin 55662eca69 Merge branch 'develop' into mplegendre-multi_pkgsrc_roots ... Conflicts: lib/spack/spack/__init__.py lib/spack/spack/directives.py lib/spack/spack/packages.py		2015-11-12 15:16:06 -08:00
..
spack	Merge branch 'develop' into mplegendre-multi_pkgsrc_roots	2015-11-12 15:16:06 -08:00