alalazo a17d1efe7c Merge branch 'develop' of https://github.com/LLNL/spack into features/source_diffs_in_environment_modifications ... Conflicts: lib/spack/spack/test/environment.py		2016-06-18 13:31:29 +02:00
..
spack	Merge branch 'develop' of https://github.com/LLNL/spack into features/source_diffs_in_environment_modifications	2016-06-18 13:31:29 +02:00