Merged revisions 379128 via svnmerge from
authorAutomerge script <automerge@asterisk.org>
Tue, 15 Jan 2013 23:20:18 +0000 (23:20 +0000)
committerAutomerge script <automerge@asterisk.org>
Tue, 15 Jan 2013 23:20:18 +0000 (23:20 +0000)
commit0dc9cc48a0b80e041ca03bc957cb4e11567b205a
treefb197a5a0db526f4c19817d818f6fbaec8617d11
parenta73d6e5b86cfeac94791874295743ae61504ccec
Merged revisions 379128 via svnmerge from
file:///srv/subversion/repos/asterisk/trunk

........
  r379128 | rmudgett | 2013-01-15 16:23:49 -0600 (Tue, 15 Jan 2013) | 1 line

  Fix ast_bridge_features_register() not registering builtin features. I broke. Ooops.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@379138 65c4cc65-6c06-0410-ace0-fbb531ad65f3
main/bridging.c