Merged revisions 304683 via svnmerge from
authorSean Bright <sean@malleable.com>
Fri, 28 Jan 2011 22:59:27 +0000 (22:59 +0000)
committerSean Bright <sean@malleable.com>
Fri, 28 Jan 2011 22:59:27 +0000 (22:59 +0000)
commitc5cf436a9299e51d838794d731ecab1874aa7109
tree0c8ef58668fb7da55a1e3e13a4a16bbf706670e1
parent64dfc6e73571e46737652be219f0bb0d5b83b4ea
Merged revisions 304683 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r304683 | seanbright | 2011-01-28 17:54:23 -0500 (Fri, 28 Jan 2011) | 16 lines

  Merged revisions 304659,304682 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r304659 | seanbright | 2011-01-28 16:22:09 -0500 (Fri, 28 Jan 2011) | 5 lines

    Don't leak references if we can't create a pseudo channel for mixing in MeetMe.

    If there was a problem allocating a pseudo channel when building our meetme, we
    weren't destroying our user container or destroying the mutexes that we created.
  ........
    r304682 | seanbright | 2011-01-28 17:38:05 -0500 (Fri, 28 Jan 2011) | 2 lines

    Revert part of the previous commit that snuck in.
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@304684 65c4cc65-6c06-0410-ace0-fbb531ad65f3
apps/app_meetme.c