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

[murch at andrew.cmu.edu]

Update of /afs/andrew/system/cvs/src/cyrus/imap
In directory unix38.andrew.cmu.edu:/var/tmp/cvs-serv27518

Modified Files:
      Tag: cyrus-imapd-2_4
	imapd.c 
Log Message:
merged changes from trunk


committed with tag cyrus-imapd-2_4
--- links to diffs follow ---
http://bugzilla.andrew.cmu.edu/cgi-bin/cvsweb.cgi/src/cyrus/imap/imapd.c.diff?r1=1.502.2.6&r2=1.502.2.7&only_with_tag=cyrus-imapd-2_4