From 477cd9cccea2c106ec7b38319fea9af3142e00cd Mon Sep 17 00:00:00 2001
From: "rafael@riseup.net"
 <rafael@riseup.net@caa462fc-51d2-11de-8b28-e1b452efc53a>
Date: Tue, 22 Dec 2009 13:43:19 +0000
Subject: [PATCH] added missing commits to changelog and new authors to authors

---
 darkice/trunk/AUTHORS   | 3 ++-
 darkice/trunk/ChangeLog | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/darkice/trunk/AUTHORS b/darkice/trunk/AUTHORS
index 43086e2..674c97e 100644
--- a/darkice/trunk/AUTHORS
+++ b/darkice/trunk/AUTHORS
@@ -39,4 +39,5 @@ with contributions by:
     Daniel Hazelbaker <daniel@highdesertchurch.com>
     Alessandro Beretta <alessandro.baretta@radiomaria.org>
     Roland Hermans <roland.hermans@omroepvenray.nl>
-
+    Sergiy <piratfm@gmail.com>
+    Clemens Ladisch <clemens@ladisch.de>
diff --git a/darkice/trunk/ChangeLog b/darkice/trunk/ChangeLog
index f7289b8..d812df6 100644
--- a/darkice/trunk/ChangeLog
+++ b/darkice/trunk/ChangeLog
@@ -1,3 +1,9 @@
+Next release
+    o implemented samplerate conversion for all codecs using libsamplerate, 
+	  and keeping internal aflibConverter as fallback,
+          thanks to Sergiy <piratfm@gmail.com>
+    o bugfix: fix for alsa driver - closes ticked #8
+          thanks to Clemens Ladisch <clemens@ladisch.de> 
 14-11-2009 Darkice 0.20.1 released
     o added rc.darkice init script
 	  thanks to Niels Dettenbach <nd@syndicat.com>