From: Andre Noll <maan@systemlinux.org>
Date: Sun, 15 May 2011 07:39:51 +0000 (+0200)
Subject: Merge branch 't/ssh_keys'
X-Git-Tag: v0.4.7~8
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=c41a04fb296e068ebfec78bba9678bf15daea896;p=paraslash.git

Merge branch 't/ssh_keys'
---

c41a04fb296e068ebfec78bba9678bf15daea896
diff --cc NEWS
index 4430343e,32957386..bf6f2bab
--- a/NEWS
+++ b/NEWS
@@@ -2,8 -2,6 +2,9 @@@
  0.4.7 (to be announced) "infinite rollback"
  -------------------------------------------
  
 +	- Support for ESD, Pulseaudio, AIX, Solaris, IRIX and other
 +	  platforms through the libao audio library.
++	- Support for RSA keys generated with ssh-keygen.
  	- configure: improved options for ogg/vorbis/speex.
  	- The git version reported by --version always matches HEAD.
  	- The autogen script detects the number of processors and