-
Committer:
Matt Nordhoff
-
Date:
2010-05-04 02:22:51 UTC
-
mfrom:
(164.152.7 integration)
-
Revision ID:
mnordhoff@mattnordhoff.com-20100504022251-ekbb12orq2slu4ah
Merge lp:~jameinel/loggerhead/integration.
Requires bzr-history-db now.
There were some conflicts, but I think I got 'em right. I chopped out the logging changes.