alalazo 213e3f0860 Merge branch 'develop' of https://github.com/LLNL/spack into features/install_with_phases_rebase ... Conflicts: lib/spack/spack/cmd/install.py lib/spack/spack/cmd/setup.py		2016-10-21 12:38:43 +02:00
..
spack	Merge branch 'develop' of https://github.com/LLNL/spack into features/install_with_phases_rebase	2016-10-21 12:38:43 +02:00