[Monotone-commits-diffs] Revision aa6f2b85ff2a99fa7060f7ea7bb0d0e0a924bc00

[monotone]

-----------------------------------------------------------------
Revision: aa6f2b85ff2a99fa7060f7ea7bb0d0e0a924bc00
Ancestor: c1d550c516cb5378c0c9ee14ea0c7fa8cd0fa9df
Ancestor: ea183cafeb2dbe2e4c4fe5090ad4aa8dd50dc017
Author: Timothy Brownawell  <address@hidden>
Date: 2010-06-03 03.56.29
Branch: net.venge.monotone

Modified files:
        NEWS cmd_key_cert.cc cmd_list.cc cmd_packet.cc
        cmd_ws_commit.cc database.cc database.hh lua_hooks.cc
        monotone.texi network/netsync_session.cc network/session.cc
        outdated_indicator.cc outdated_indicator.hh project.cc
        project.hh tests/log_--diffs/__driver__.lua
        tests/log_--diffs/expect_restrict

ChangeLog: 

merge of 'c1d550c516cb5378c0c9ee14ea0c7fa8cd0fa9df'
     and 'ea183cafeb2dbe2e4c4fe5090ad4aa8dd50dc017'


monotone --db={your.database} diff 
--revision=c1d550c516cb5378c0c9ee14ea0c7fa8cd0fa9df 
--revision=aa6f2b85ff2a99fa7060f7ea7bb0d0e0a924bc00
monotone --db={your.database} diff 
--revision=ea183cafeb2dbe2e4c4fe5090ad4aa8dd50dc017 
--revision=aa6f2b85ff2a99fa7060f7ea7bb0d0e0a924bc00
----------------------------------------------------------------------