Merged revisions 59215 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Mon, 26 Mar 2007 18:29:10 +0000 (18:29 +0000)
committerRussell Bryant <russell@russellbryant.com>
Mon, 26 Mar 2007 18:29:10 +0000 (18:29 +0000)
commit1e3a59b69bb3f145892c9c60d5c7fdec3c9a69ea
treec15f5d6892ca39a6ac55a8a0f83c381d309bdba3
parent722962dec4999936e5764efefec508d8acade921
Merged revisions 59215 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r59215 | russell | 2007-03-26 13:28:29 -0500 (Mon, 26 Mar 2007) | 3 lines

Fix some codec negotiation problems when CallerID support is not enabled in SLA.
(issue #9308, reported by twilson)

........

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