alalazo 3d7684277a Merge branch 'openmpi_variants' of github.com:epfl-scitas/spack into openmpi_variants ... Conflicts: var/spack/repos/builtin/packages/openmpi/package.py		2016-05-09 10:56:26 +02:00
..
spack/repos	Merge branch 'openmpi_variants' of github.com:epfl-scitas/spack into openmpi_variants	2016-05-09 10:56:26 +02:00