[Monotone-commits-diffs] Revision 932f45118f2cb0be187ca8fc3e5f37ebde3eaca1

[monotone]

-----------------------------------------------------------------
Revision: 932f45118f2cb0be187ca8fc3e5f37ebde3eaca1
Ancestor: 000d5f6c2ae8164e978e489ad20b7100ee7f66b2
Ancestor: 1cdfc523087a9900454e9f0c5d102dd16a81e121
Author: address@hidden
Date: 2008-02-07T16:35:15
Branch: net.venge.monotone.experiment.encapsulation

Modified files:
        app_state.cc app_state.hh automate.cc cmd_db.cc
        cmd_key_cert.cc cmd_list.cc cmd_merging.cc cmd_netsync.cc
        cmd_othervcs.cc cmd_packet.cc cmd_ws_commit.cc key_store.cc
        key_store.hh monotone.cc po/de.po

ChangeLog: 

merge of '000d5f6c2ae8164e978e489ad20b7100ee7f66b2'
     and '1cdfc523087a9900454e9f0c5d102dd16a81e121'


monotone --db={your.database} diff 
--revision=000d5f6c2ae8164e978e489ad20b7100ee7f66b2 
--revision=932f45118f2cb0be187ca8fc3e5f37ebde3eaca1
monotone --db={your.database} diff 
--revision=1cdfc523087a9900454e9f0c5d102dd16a81e121 
--revision=932f45118f2cb0be187ca8fc3e5f37ebde3eaca1
----------------------------------------------------------------------