[Monotone-commits-nodiffs] Revision e4859ff154733feb45cdf19a464a3872b595d8f1

[monotone]

-----------------------------------------------------------------
Revision: e4859ff154733feb45cdf19a464a3872b595d8f1
Ancestor: 3b496cb8f6cd51180f6d8eb3fc7f27cce3c6fd76
Ancestor: 671e2765122c050be5ba54dcaef38dad2b933de1
Author: address@hidden
Date: 2010-06-13 22.57.35
Branch: net.venge.monotone

Modified files:
        Makefile.am base.hh cmd_automate.cc roster.cc roster.hh
        sanity.cc unit-tests/roster.cc

ChangeLog: 

merge of '3b496cb8f6cd51180f6d8eb3fc7f27cce3c6fd76'
     and '671e2765122c050be5ba54dcaef38dad2b933de1'


monotone --db={your.database} diff 
--revision=3b496cb8f6cd51180f6d8eb3fc7f27cce3c6fd76 
--revision=e4859ff154733feb45cdf19a464a3872b595d8f1
monotone --db={your.database} diff 
--revision=671e2765122c050be5ba54dcaef38dad2b933de1 
--revision=e4859ff154733feb45cdf19a464a3872b595d8f1
----------------------------------------------------------------------