Merge branch 'master' into next

Conflicts:
	client_common.c

diff --git a/NEWS b/NEWS
index 9c13ed8129ade866cdec46e8e3c55875e7e664af..68c3f406ece95d109e2b74283144d8d047763e1e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -32,6 +32,7 @@ provided for conversion of the 0.3 database to the new 0.4 format.
        - --log_color actually works
        - new ls option: -d (print dates as seconds after the epoch)
        - update to gengetopt 2.22.2
+       - support for RSA keys of size > 512 bits
 
 -----------------------------------------
 0.3.4 (2009-05-07) "elliptic inheritance"