Merged revisions 97450 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Wed, 9 Jan 2008 16:13:24 +0000 (16:13 +0000)
committerJoshua Colp <jcolp@digium.com>
Wed, 9 Jan 2008 16:13:24 +0000 (16:13 +0000)
commit2ad2f9240581cb2bb0195bfcf815f8f440131723
tree403fe273b19100625607d80234756d5ff1cd21ae
parentdae22c956741e568b6c93b7ac20f7ceab719dfd8
Merged revisions 97450 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r97450 | file | 2008-01-09 12:11:17 -0400 (Wed, 09 Jan 2008) | 6 lines

Don't do conferencing totally in Zaptel if Monitor is running on the channel.
(closes issue #11709)
Reported by: BigJimmy
Patches:
      patch-meetmerec uploaded by BigJimmy (license 371)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@97451 65c4cc65-6c06-0410-ace0-fbb531ad65f3
apps/app_meetme.c