Merge branch 'develop' of github.com:kev40293/spack into develop

Conflicts:
	var/spack/packages/atlas/package.py
This commit is contained in:
Kevin Brandstatter 2015-03-03 19:24:19 -06:00
commit 51cb785695

Diff Content Not Available