Merged revisions 376867,376871 via svnmerge from
authorAutomerge script <automerge@asterisk.org>
Thu, 29 Nov 2012 23:19:44 +0000 (23:19 +0000)
committerAutomerge script <automerge@asterisk.org>
Thu, 29 Nov 2012 23:19:44 +0000 (23:19 +0000)
commitb2df2488b632b0a6ec23d330c7e6ec8a2054a065
tree0896e070395c8922a98cbad7d0abd8a1f0558223
parentf052e88b49743306dea12b14efe8973286a0f758
Merged revisions 376867,376871 via svnmerge from
file:///srv/subversion/repos/asterisk/trunk

................
  r376867 | rmudgett | 2012-11-29 16:34:24 -0600 (Thu, 29 Nov 2012) | 13 lines

  Fix compile error.

  (issue ASTERISK-20724)
  ........

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

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

  Merged revisions 376866 from http://svn.asterisk.org/svn/asterisk/branches/11
................
  r376871 | rmudgett | 2012-11-29 17:01:16 -0600 (Thu, 29 Nov 2012) | 13 lines

  chan_local: Fix local_pvt ref leak in local_devicestate().

  Regression introduced by ASTERISK-20390 fix.
  ........

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

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

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@376878 65c4cc65-6c06-0410-ace0-fbb531ad65f3
channels/chan_local.c
channels/chan_sip.c