Merged revisions 377035,377040 via svnmerge from
authorAutomerge script <automerge@asterisk.org>
Mon, 3 Dec 2012 17:19:46 +0000 (17:19 +0000)
committerAutomerge script <automerge@asterisk.org>
Mon, 3 Dec 2012 17:19:46 +0000 (17:19 +0000)
commitf6f7774b193fe05580f8c6044ddde69f52c3aa2c
treec5206786afad8eae84ceb62da83e1868cdb817d7
parente7ce12839daeb903eeaff999171025e6652b7c26
Merged revisions 377035,377040 via svnmerge from
file:///srv/subversion/repos/asterisk/trunk

................
  r377035 | oej | 2012-12-03 10:45:49 -0600 (Mon, 03 Dec 2012) | 2 lines

  Formatting fixes
................
  r377040 | rmudgett | 2012-12-03 11:10:40 -0600 (Mon, 03 Dec 2012) | 16 lines

  Fix CCSS CLI commands and logger level not unregistered.

  (issue ASTERISK-20649)
  Reported by: Corey Farrell
  Patches:
        ccss-cleanup-all.patch (license #5909) patch uploaded by Corey Farrell
  ........

  Merged revisions 377037 from http://svn.asterisk.org/svn/asterisk/branches/1.8
  ........

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

  Merged revisions 377039 from http://svn.asterisk.org/svn/asterisk/branches/11
................

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