Matthew LeGendre dd0ae255ad Merge branch 'features/external-packages' of github.com:mplegendre/spack into features/external-packages ... Conflicts: lib/spack/docs/site_configuration.rst		2016-03-09 16:18:37 -08:00
..
spack	Merge branch 'features/external-packages' of github.com:mplegendre/spack into features/external-packages	2016-03-09 16:18:37 -08:00