[Monotone-commits-diffs] Revision 232fd09f687d8eb2b24888f66ceee6b4c65bc98e

[monotone]

-----------------------------------------------------------------
Revision: 232fd09f687d8eb2b24888f66ceee6b4c65bc98e
Ancestor: 04add2aec13d1223b77590c996751f2b8e2e39b9
Ancestor: 440061d2ecc07b76b7ba23b12ffa5647d7544e1f
Author: Timothy Brownawell  <address@hidden>
Date: 2006-05-15T21:10:15
Branch: net.venge.monotone.contrib.webhost

Modified files:
        Makefile usher/administrator.cc usher/administrator.hh
        usher/server.cc usher/server_manager.cc
        usher/server_manager.hh usher/sock.cc usher/sock.hh
        usher/usher.cc usher/usher.txt

ChangeLog: 

merge of 04add2aec13d1223b77590c996751f2b8e2e39b9
     and 440061d2ecc07b76b7ba23b12ffa5647d7544e1f


monotone --db={your.database} diff 
--revision=04add2aec13d1223b77590c996751f2b8e2e39b9 
--revision=232fd09f687d8eb2b24888f66ceee6b4c65bc98e
monotone --db={your.database} diff 
--revision=440061d2ecc07b76b7ba23b12ffa5647d7544e1f 
--revision=232fd09f687d8eb2b24888f66ceee6b4c65bc98e
----------------------------------------------------------------------