[Monotone-commits-diffs] Revision fef0902161339786df4b1d7a9ab10a59d1a42c12

[monotone]

-----------------------------------------------------------------
Revision: fef0902161339786df4b1d7a9ab10a59d1a42c12
Ancestor: 70230559a9f88f2df47217c4cc6a27d8a3160a45
Ancestor: 9b49fc5e7431595b512ab3683a6a70771b181791
Author: address@hidden
Date: 2009-01-11T04:19:41
Branch: net.venge.monotone

Modified files:
        cmd_db.cc monotone.texi revision.cc roster.cc
        roster_merge.cc tests/netsync_permissions/__driver__.lua

ChangeLog: 

merge of '70230559a9f88f2df47217c4cc6a27d8a3160a45'
     and '9b49fc5e7431595b512ab3683a6a70771b181791'


monotone --db={your.database} diff 
--revision=70230559a9f88f2df47217c4cc6a27d8a3160a45 
--revision=fef0902161339786df4b1d7a9ab10a59d1a42c12
monotone --db={your.database} diff 
--revision=9b49fc5e7431595b512ab3683a6a70771b181791 
--revision=fef0902161339786df4b1d7a9ab10a59d1a42c12
----------------------------------------------------------------------