Elizabeth Fischer 50ac98bc04 Merge remote-tracking branch 'upstream/develop' into efischer/160630-StagedPackage ... # Conflicts: # lib/spack/docs/packaging_guide.rst # lib/spack/spack/package.py Mostly minor/formatting issues in lib/spack/spack/package.py (the heavyweight merge was already done recently). Only one serious issue: it looks like the feature branch had accidentally deleted the line `spack.hooks.post_install(self)`. This got added back in from develop.		2016-06-30 09:13:24 -04:00
..
spack	Merge remote-tracking branch 'upstream/develop' into efischer/160630-StagedPackage	2016-06-30 09:13:24 -04:00