[openssh-commits] CVS: fuyu.mindrot.org: openssh

[Damien Miller]

CVSROOT:	/var/cvs
Module name:	openssh
Changes by:	djm at fuyu.mindrot.org	2006/01/04 07:27:51

Modified files:
	.              : ChangeLog channels.c 

Log message:
- (djm) [channels.c] clean up harmless merge error, from reyk@

cvs -n rdiff -u -r1.4072 -r1.4073 openssh/ChangeLog
cvs -n rdiff -u -r1.209 -r1.210 openssh/channels.c