Merge branch 'completion-fixes' into jk/pu

* branch completion-fixes:
  completion: learn more git base options
  completion: handle unstuck form of base git options
Merge branch 'doc-makefile-fix' into jk/pu

* branch doc-makefile-fix:
  Documentation/Makefile: move infodir to be with other '*dir's
  Documentation/Makefile: fix spaces around assignments
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 'python-2to3-in-makefile' into jk/pu

* branch python-2to3-in-makefile:
  fixup! svn-fe: allow svnrdump_sim.py to run with Python 3
  Makefile: Run 2to3 on Python scripts
Merge branch 'submodule-subdirectory-ok' into jk/pu

* branch submodule-subdirectory-ok:
  submodule: fix quoting in relative_path()