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

[murch at andrew.cmu.edu]

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

Modified Files:
      Tag: cyrus-imapd-2_3
	depot.conf 
Log Message:
merged changes from trunk


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