[Cyrus-CVS] src/cyrus/depot by murch

[murch at andrew.cmu.edu]

Update of /afs/andrew/system/cvs/src/cyrus/depot
In directory unix35.andrew.cmu.edu:/var/tmp/cvs-serv8282/depot

Modified Files:
      Tag: cyrus-imapd-2_4
	depot.conf 
Log Message:
merged changes from trunk (2.3.9->2.3.10)


committed with tag cyrus-imapd-2_4
--- links to diffs follow ---
http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/depot/depot.conf.diff?r1=1.5&r2=1.5.4.1&only_with_tag=cyrus-imapd-2_4