Merged revisions 103324 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Mon, 11 Feb 2008 22:10:55 +0000 (22:10 +0000)
committerJoshua Colp <jcolp@digium.com>
Mon, 11 Feb 2008 22:10:55 +0000 (22:10 +0000)
commit3f99a1b4bf1fa569c9a0c201a327508eb9ad94a4
tree1c107778539968fa8874ab9f6b45671a0abf8953
parentcc0c25c76c84790b8ac3a9ad8cfab32abfc39346
Merged revisions 103324 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r103324 | file | 2008-02-11 18:09:07 -0400 (Mon, 11 Feb 2008) | 4 lines

If entering a conference with the 'w' option ensure that we can't listen or speak until the marked user appears.
(closes issue #11835)
Reported by: alanmcmillan

........

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