Merged revisions 217199 via svnmerge from

Merged revisions 217199 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r217199 | tilghman | 2009-09-08 15:28:41 -0500 (Tue, 08 Sep 2009) | 14 lines

  Merged revisions 217156 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r217156 | tilghman | 2009-09-08 15:01:45 -0500 (Tue, 08 Sep 2009) | 7 lines

    When MOH is playing on the channel, announcements sent through the conference are not heard.
    (closes issue #14588)
     Reported by: voipas
     Patches:
           20090716__issue14588__2.diff.txt uploaded by tilghman (license 14)
     Tested by: lmadsen, twisted, tilghman
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@217213 65c4cc65-6c06-0410-ace0-fbb531ad65f3