alalazo 893a5565fe Merge branch 'develop' of https://github.com/LLNL/spack into features/install_with_phases ...

Conflicts:
	lib/spack/spack/__init__.py
	var/spack/repos/builtin/packages/gmp/package.py
	var/spack/repos/builtin/packages/openjpeg/package.py

2016-07-15 11:02:55 +02:00

..

spack

Merge branch 'develop' of https://github.com/LLNL/spack into features/install_with_phases

2016-07-15 11:02:55 +02:00