Merge branch 'develop' of ssh://cz-stash.llnl.gov:7999/scale/spack into develop

lib/spack/docs/Makefile

@@ -42,12 +42,14 @@ gh-pages: _build/html
 	touch .nojekyll && \
 	git init && \
 	git add . && \
-	git commit -m "Initial commit" && \
+	git commit -m "Spack Documentation" && \
 	git push -f $$root master:gh-pages && \
 	rm -rf .git
 
 upload:
 	rsync -avz --rsh=ssh --delete _build/html/ cab:/usr/global/web-pages/lc/www/adept/docs/spack
+	git push -f origin gh-pages
+	git push -f github gh-pages
 
 apidoc:
 	sphinx-apidoc -T -o . $(PYTHONPATH)/spack

lib/spack/spack/cmd/info.py

@@ -94,6 +94,9 @@ def info_rst():
         print "    * `Homepage <%s>`__" % pkg.homepage
         print "    * `%s/package.py <%s>`__" % (pkg.name, github_url(pkg))
         print
+        if pkg.versions:
+            print "Versions:"
+            print "  " + ", ".join(str(v) for v in reversed(sorted(pkg.versions)))
         if pkg.dependencies:
             print "Dependencies"
             print "  " + ", ".join("`%s`_" % d if d != "mpi" else d