Merge branch 'rebase-i-comment-squash' into jk/pu

* branch rebase-i-comment-squash:
  rebase -i: comment first line of autosquashed message

Comment out the first line of a "!squash" commit when generating a
commit message in git-rebase.

Merged to jk/pu on 2013-03-30.  Dogfooding for a while to see if
this is a sensible change.
Merge branch 'log-cherry-no-merges' into jk/pu

* branch log-cherry-no-merges:
  revision.c: ignore merges for cherry-pick

Don't consider merges for cherry comparison.
Merge branch 'split-instaweb' into jk/pu

* branch split-instaweb:
  instaweb: refactor httpd code into separate files

Split the instaweb script to have each HTTP daemon in its own file.

Conflicts:
	git-instaweb.sh