[asterisk-commits] mvanbaak: branch 1.6.1 r138854 - /branches/1.6.1/

[SVN commits to the Asterisk project]

Author: mvanbaak
Date: Tue Aug 19 12:00:31 2008
New Revision: 138854

URL: http://svn.digium.com/view/asterisk?view=rev&rev=138854
Log:
Blocked revisions 138851 via svnmerge

........
r138851 | mvanbaak | 2008-08-19 18:56:50 +0200 (Tue, 19 Aug 2008) | 8 lines

chan_skinny now respects callwaiting=no

(closes issue #12691)
Reported by: sbisker
Patches:
      callwaitingv1.diff uploaded by wedhorn (license 30)
Tested by: wedhorn on old skinny phones, mvanbaak on 7960 and 7905 with latest firmware

........

Modified:
    branches/1.6.1/   (props changed)

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
--- trunk-blocked (original)
+++ trunk-blocked Tue Aug 19 12:00:31 2008
@@ -1,1 +1,1 @@
-/trunk:137901
+/trunk:137901,138851