Erik Schnetter 8eb16ba02d Merge branch 'develop' into eschnett/petsc-python-2 ... # Conflicts: # var/spack/packages/petsc/package.py		2016-01-12 14:36:37 -05:00
..
spack	Merge branch 'develop' into eschnett/petsc-python-2	2016-01-12 14:36:37 -05:00