alalazo 6f11a64af5 Merge branch 'develop' of https://github.com/LLNL/spack into refactoring/resource_directive ... Conflicts: lib/spack/spack/fetch_strategy.py lib/spack/spack/mirror.py lib/spack/spack/package.py		2016-01-26 08:59:25 +01:00
..
spack	Merge branch 'develop' of https://github.com/LLNL/spack into refactoring/resource_directive	2016-01-26 08:59:25 +01:00