1 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ad5b66a78..00c74c3e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 20130605
- - (dtucker) Enable sha256 kex methods based on the presence of the necessary
+ - (dtucker) [myproposal.h] Enable sha256 kex methods based on the presence of
-   functions, not from the openssl version.
+   the necessary functions, not from the openssl version.
+ - (dtucker) [contrib/ssh-copy-id] bz#2117: Use portable operator in test.
+   Patch from cjwatson at debian.
 20130602
 - (tim) [Makefile.in] Make Solaris, UnixWare, & OpenServer linkers happy

diff --git a/ChangeLog b/ChangeLog index ad5b66a78..00c74c3e5 100644 --- a/ChangeLog +++ b/ChangeLog
@@ -1,6 +1,8 @@
1	20130605	1	20130605
2	- (dtucker) Enable sha256 kex methods based on the presence of the necessary	2	- (dtucker) [myproposal.h] Enable sha256 kex methods based on the presence of
3	functions, not from the openssl version.	3	the necessary functions, not from the openssl version.
		4	- (dtucker) [contrib/ssh-copy-id] bz#2117: Use portable operator in test.
		5	Patch from cjwatson at debian.
4		6
5	20130602	7	20130602
6	- (tim) [Makefile.in] Make Solaris, UnixWare, & OpenServer linkers happy	8	- (tim) [Makefile.in] Make Solaris, UnixWare, & OpenServer linkers happy