Merged revisions 377743 via svnmerge from

Merged revisions 377743 via svnmerge from
file:///srv/subversion/repos/asterisk/trunk

................
  r377743 | rmudgett | 2012-12-10 20:13:37 -0600 (Mon, 10 Dec 2012) | 25 lines

  Cleanup indications on exit.

  * Made ast_unregister_indication_country() unlink the found tone zone
  before selecting a new default_tone_zone to make it impossible to select
  the tone zone being unregistered again.

  * Ringcadence is no longer parsed twice in store_config_tone_zone().

  * Cleanup CLI commands and destroy default_tone_zone on exit.

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

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

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

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

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