Merged revisions 42783 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Mon, 11 Sep 2006 22:17:46 +0000 (22:17 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Mon, 11 Sep 2006 22:17:46 +0000 (22:17 +0000)
commit979ef8d2edde3a19606f3e7d73db5542acf09078
treed939bf7190dc061d301d29f2d423e1993e5e0fa2
parentda55c166dc1a6dd3800f5c31172582757eb1c125
Merged revisions 42783 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r42783 | tilghman | 2006-09-11 16:47:23 -0500 (Mon, 11 Sep 2006) | 4 lines

When paging, only wait 5 seconds for the marked user to enter the conference.
After that, assume the paging already completed by the time the channel entered
the conference and drop back out.  (Issue 7275)

........

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