Matthew LeGendre fa888a4ba1 Merge branch 'develop' into features/external-packages ...

Conflicts:
	lib/spack/spack/cmd/mirror.py
	lib/spack/spack/concretize.py
	lib/spack/spack/config.py
	lib/spack/spack/spec.py
	lib/spack/spack/stage.py
	var/spack/packages/mvapich2/package.py

2016-01-25 10:52:17 -08:00

..

spack

Merge branch 'develop' into features/external-packages

2016-01-25 10:52:17 -08:00