1 files changed, 2 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 184c36980..23ecb0618 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 - (djm) bz#1561: don't bother setting IFF_UP on tun(4) device if it is
   already set. Makes FreeBSD user openable tunnels useful; patch from
   richard.burakowski+ossh AT mrburak.net, ok dtucker@
+ - (dtucker) bug #1530: strip trailing ":" from hostname in ssh-copy-id.
+   based in part on a patch from Colin Watson, ok djm@
 20100809
 - OpenBSD CVS Sync

diff --git a/ChangeLog b/ChangeLog index 184c36980..23ecb0618 100644 --- a/ChangeLog +++ b/ChangeLog
@@ -2,6 +2,8 @@
2	- (djm) bz#1561: don't bother setting IFF_UP on tun(4) device if it is	2	- (djm) bz#1561: don't bother setting IFF_UP on tun(4) device if it is
3	already set. Makes FreeBSD user openable tunnels useful; patch from	3	already set. Makes FreeBSD user openable tunnels useful; patch from
4	richard.burakowski+ossh AT mrburak.net, ok dtucker@	4	richard.burakowski+ossh AT mrburak.net, ok dtucker@
		5	- (dtucker) bug #1530: strip trailing ":" from hostname in ssh-copy-id.
		6	based in part on a patch from Colin Watson, ok djm@
5		7
6	20100809	8	20100809
7	- OpenBSD CVS Sync	9	- OpenBSD CVS Sync