X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=debian%2Fchangelog;h=8d5d49d6b657eceec5e9b71360b1809621ec6fc6;hb=b90ef1f17bd9ed82b7df206751c26fddeaa1cbae;hp=f6b8045488bbb42f65024f9dd3e158fc09ba790a;hpb=281e66b2740324eb9c6e711d89111a62b9f086c7;p=grml-etc.git

diff --git a/debian/changelog b/debian/changelog
index f6b8045..8d5d49d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+grml-etc (1.2.11) unstable; urgency=low
+
+  [ Ulrich Dangel ]
+  * [913dcbf] Support SSHD_OPTS option
+  * [20a1e40] Generate ECDSA key if necessary
+
+  [ Christian Hofstaedtler ]
+  * [281e66b] Resync ssh initscript with Debian
+
+ -- Christian Hofstaedtler <ch@grml.org>  Wed, 25 May 2011 16:37:04 +0200
+
 grml-etc (1.2.10) unstable; urgency=low
 
   * [34a666b + 89fc5a7] xinitrc.d/grml_keyboard + Xmodmaps: fix