Merged revisions 377245-377246 via svnmerge from
authorAutomerge script <automerge@asterisk.org>
Wed, 5 Dec 2012 03:19:08 +0000 (03:19 +0000)
committerAutomerge script <automerge@asterisk.org>
Wed, 5 Dec 2012 03:19:08 +0000 (03:19 +0000)
commit521f9e8dfee50c2d81aa27839c7fce4e5ecda5a0
tree040e3ef9e458d2da716a9ecb12958291313ef0f3
parent02e9f9fdd7b0d819e393572e1a9810df88875e06
Merged revisions 377245-377246 via svnmerge from
file:///srv/subversion/repos/asterisk/trunk

................
  r377245 | rmudgett | 2012-12-04 20:20:57 -0600 (Tue, 04 Dec 2012) | 8 lines

  Fix registering core show codecs/codec CLI commands twice.
  ........

  Merged revisions 377241 from http://svn.asterisk.org/svn/asterisk/branches/10
  ........

  Merged revisions 377244 from http://svn.asterisk.org/svn/asterisk/branches/11
................
  r377246 | rmudgett | 2012-12-04 20:23:10 -0600 (Tue, 04 Dec 2012) | 1 line

  Remove init_framer(). It no longer does anything.
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@377251 65c4cc65-6c06-0410-ace0-fbb531ad65f3
include/asterisk/_private.h
main/asterisk.c
main/format.c