aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.version2
-rw-r--r--ChangeLog13
2 files changed, 14 insertions, 1 deletions
diff --git a/.version b/.version
index 9baec2fdf..71e4ca0de 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-1.4.33
+1.4.33.1
diff --git a/ChangeLog b/ChangeLog
index 3bdc6e839..5b15949d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2010-06-22 Russell Bryant <russell@digium.com>
+
+ * Asterisk 1.4.33.1 Released.
+
+ * channels/chan_dahdi.c: Merge revision 270404 from the 1.4 branch.
+
+ fixes FXS port still ringing when answered, as reported by Tzafrir
+ on dev-list.
+
+ (issue #17067)
+ Reported by: tzafrir
+ Tested by: alecdavis
+
2010-06-17 Leif Madsen <lmadsen@digium.com>
* Asterisk 1.4.33 Released.