alalazo 40cb314638 Merge branch 'develop' of https://github.com/LLNL/spack into features/install_with_phases ... Conflicts: lib/spack/spack/package.py		2016-07-20 21:02:19 +02:00
..
spack	Merge branch 'develop' of https://github.com/LLNL/spack into features/install_with_phases	2016-07-20 21:02:19 +02:00