Various Python3 fixes.
Find another way to shut up patch.
A whole raft of str versus bytes issues.
Don't use print
Byte arrays instead of strings.
filter returns generator in Python 3
Python 2.6 compatability.
fixend themes naming in makefile
fixed submodule update in makefile and in conf.py for rtd
re added themes as submodule
Try to get docs to build automatically.
added a docs "extras" for installing sphinx
Merge added in both.
Merge removed in both.
Correctly track merges.
changed docs theme for pylons
added sphinx docs and pyramid theme support
Not for later.
Test branch and then merge.
Allow specification of arbitrary head.
Allow base commit to be set per transaction.
Reinstate support for bare repositories.
Better debugging. Don't use asserts in merge, since those can be disa…
Merge removed files.
Rudimentary tree merging.
Start to think about merging more formally.
Partial patch to require a working directory and then use porcelain m…