Merged revisions 325537 via svnmerge from
authorMatthew Nicholson <mnicholson@digium.com>
Wed, 29 Jun 2011 15:36:20 +0000 (15:36 +0000)
committerMatthew Nicholson <mnicholson@digium.com>
Wed, 29 Jun 2011 15:36:20 +0000 (15:36 +0000)
commit6c7d437287a662c8009ac8eb18b39aeb31f02060
treeafb00c4a2607562c313d485590e3870f33a79701
parentf99a06d030b95b45fe8209920613811b13830b79
Merged revisions 325537 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r325537 | mnicholson | 2011-06-29 10:34:47 -0500 (Wed, 29 Jun 2011) | 2 lines

  don't do native/remote bridging if a framehook is active on the channel
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@325538 65c4cc65-6c06-0410-ace0-fbb531ad65f3
apps/app_dial.c
main/rtp_engine.c