[Monotone-commits-diffs] Revision ff870236c643576ec63bffa02ecc07945ede878c

[monotone]

-----------------------------------------------------------------
Revision: ff870236c643576ec63bffa02ecc07945ede878c
Ancestor: 0213fcfd90133f6a7c05c85e8866eafcc52b0eb9
Ancestor: 2c2e74817fff6b481c5c10297137aff7e8a8d6a2
Author: address@hidden
Date: 2008-02-05T01:54:14
Branch: net.venge.monotone.experiment.encapsulation

Modified files:
        Makefile.am automate.cc cmd_key_cert.cc database.cc
        database.hh key_store.cc key_store.hh keys.cc keys.hh
        netsync.cc tests/automate_genkey/__driver__.lua
        tests/automate_keys/__driver__.lua

ChangeLog: 

merge of '0213fcfd90133f6a7c05c85e8866eafcc52b0eb9'
     and '2c2e74817fff6b481c5c10297137aff7e8a8d6a2'


monotone --db={your.database} diff 
--revision=0213fcfd90133f6a7c05c85e8866eafcc52b0eb9 
--revision=ff870236c643576ec63bffa02ecc07945ede878c
monotone --db={your.database} diff 
--revision=2c2e74817fff6b481c5c10297137aff7e8a8d6a2 
--revision=ff870236c643576ec63bffa02ecc07945ede878c
----------------------------------------------------------------------