Merge lp://staging/~jelmer/loggerhead/isort into lp://staging/loggerhead

__init__.py (+1/-1)
loggerhead-serve (+0/-1)
loggerhead.wsgi (+8/-5)
loggerhead/apps/__init__.py (+1/-1)
loggerhead/apps/branch.py (+7/-10)
loggerhead/apps/transport.py (+4/-6)
loggerhead/changecache.py (+1/-2)
loggerhead/config.py (+1/-1)
loggerhead/controllers/__init__.py (+2/-5)
loggerhead/controllers/annotate_ui.py (+3/-2)
loggerhead/controllers/changelog_ui.py (+1/-2)
loggerhead/controllers/diff_ui.py (+2/-3)
loggerhead/controllers/download_ui.py (+3/-4)
loggerhead/controllers/error_ui.py (+2/-2)
loggerhead/controllers/filediff_ui.py (+3/-5)
loggerhead/controllers/inventory_ui.py (+2/-8)
loggerhead/controllers/revision_ui.py (+1/-3)
loggerhead/controllers/search_ui.py (+1/-1)
loggerhead/controllers/view_ui.py (+7/-15)
loggerhead/daemon.py (+1/-1)
loggerhead/highlight.py (+3/-3)
loggerhead/history.py (+2/-3)
loggerhead/load_test.py (+4/-9)
loggerhead/lsprof.py (+2/-1)
loggerhead/main.py (+4/-5)
loggerhead/templatefunctions.py (+3/-8)
loggerhead/tests/test_controllers.py (+3/-13)
loggerhead/tests/test_history.py (+2/-6)
loggerhead/tests/test_http_head.py (+0/-1)
loggerhead/tests/test_load_test.py (+1/-2)
loggerhead/tests/test_simple.py (+5/-8)
loggerhead/util.py (+7/-7)
loggerhead/wholehistory.py (+1/-1)
loggerhead/zptsupport.py (+2/-2)