alalazo fbeffee91e Merge branch 'develop' of https://github.com/LLNL/spack into features/env_objects_flying_around ... Conflicts: lib/spack/spack/package.py var/spack/repos/builtin/packages/netlib-scalapack/package.py		2016-03-21 09:46:49 +01:00
..
spack/repos	Merge branch 'develop' of https://github.com/LLNL/spack into features/env_objects_flying_around	2016-03-21 09:46:49 +01:00