# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1433431448 -28800
# Node ID 6aeadee3f16b59bdd9e2bcbb471185e8f1ccc56e
# Parent  d7b752525b9147a6b6e6667666dffc7434996c06# Parent  aaf576b27a10cf2f3b82723363238432a2394c65
merge

diff -r d7b752525b91 -r 6aeadee3f16b cli-kex.c
diff -r d7b752525b91 -r 6aeadee3f16b cli-session.c
diff -r d7b752525b91 -r 6aeadee3f16b common-algo.c
diff -r d7b752525b91 -r 6aeadee3f16b common-kex.c
diff -r d7b752525b91 -r 6aeadee3f16b common-session.c
diff -r d7b752525b91 -r 6aeadee3f16b keyimport.c