Merge lp://staging/~jelmer/loggerhead/more-columns into lp://staging/loggerhead

.bzrignore (+2/-0)
.testr.conf (+4/-0)
.travis.yml (+22/-0)
MANIFEST.in (+1/-1)
Makefile (+1/-1)
README.rst (+6/-5)
__init__.py (+14/-16)
docs/index.rst (+16/-15)
docs/serve-branches.rst (+1/-1)
loggerhead.wsgi (+8/-5)
loggerhead/__init__.py (+1/-10)
loggerhead/apps/branch.py (+23/-13)
loggerhead/apps/transport.py (+11/-14)
loggerhead/config.py (+2/-2)
loggerhead/controllers/__init__.py (+2/-2)
loggerhead/controllers/annotate_ui.py (+2/-1)
loggerhead/controllers/diff_ui.py (+2/-2)
loggerhead/controllers/directory_ui.py (+7/-7)
loggerhead/controllers/download_ui.py (+5/-5)
loggerhead/controllers/filediff_ui.py (+5/-5)
loggerhead/controllers/inventory_ui.py (+33/-22)
loggerhead/controllers/view_ui.py (+16/-19)
loggerhead/exporter.py (+0/-60)
loggerhead/highlight.py (+3/-3)
loggerhead/history.py (+42/-43)
loggerhead/load_test.py (+2/-2)
loggerhead/main.py (+11/-5)
loggerhead/middleware/profile.py (+1/-1)
loggerhead/search.py (+3/-3)
loggerhead/static/css/global.css (+2/-2)
loggerhead/static/css/view.css (+1/-2)
loggerhead/templatefunctions.py (+5/-5)
loggerhead/templates/directory.pt (+12/-13)
loggerhead/templates/inventory.pt (+25/-12)
loggerhead/templates/macros.pt (+1/-1)
loggerhead/tests/__init__.py (+3/-3)
loggerhead/tests/test_controllers.py (+26/-24)
loggerhead/tests/test_corners.py (+3/-1)
loggerhead/tests/test_history.py (+63/-62)
loggerhead/tests/test_http_head.py (+1/-1)
loggerhead/tests/test_load_test.py (+2/-2)
loggerhead/tests/test_revision_ui.py (+2/-1)
loggerhead/tests/test_simple.py (+8/-6)
loggerhead/tests/test_util.py (+1/-1)
loggerhead/util.py (+16/-9)
loggerhead/wholehistory.py (+3/-3)
serve-branches.1 (+1/-1)
setup.py (+3/-3)