Merged revisions 325545 via svnmerge from
authorMatthew Nicholson <mnicholson@digium.com>
Wed, 29 Jun 2011 16:19:01 +0000 (16:19 +0000)
committerMatthew Nicholson <mnicholson@digium.com>
Wed, 29 Jun 2011 16:19:01 +0000 (16:19 +0000)
commit1da33048130cd99e0410e9328f830b31dd46c923
tree1aaf7230848e5be95f33799e1ac709e4346a33f0
parent6c7d437287a662c8009ac8eb18b39aeb31f02060
Merged revisions 325545 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r325545 | mnicholson | 2011-06-29 11:18:39 -0500 (Wed, 29 Jun 2011) | 2 lines

  make framehooks prevent native bridging (for real this time)
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@325547 65c4cc65-6c06-0410-ace0-fbb531ad65f3
main/channel.c