Merged revisions 43003 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Sat, 16 Sep 2006 05:43:54 +0000 (05:43 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Sat, 16 Sep 2006 05:43:54 +0000 (05:43 +0000)
commite16104185ab8f89d23ed6dc2f2f5f0971b938c8e
treef0a90331ba8e579835c1ab330826abe347e43226
parentf18cbf77df454b86a479352c0429ab68bded5c8b
Merged revisions 43003 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r43003 | tilghman | 2006-09-15 23:44:02 -0500 (Fri, 15 Sep 2006) | 2 lines

When the marked user enters the conference, we should no longer timeout

........

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