From: Joshua Colp <jcolp@digium.com>
Date: Tue, 26 Apr 2016 09:56:36 +0000 (-0500)
Subject: Merge changes from topic 'system_stress_patches' into 13
X-Git-Tag: 13.10.0-rc1~124
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4efc6b43155452b2f9cb5f96c7aea4cdfc1a84d1;p=thirdparty%2Fasterisk.git

Merge changes from topic 'system_stress_patches' into 13

* changes:
  Bridge system: Fix memory leaks and double frees on impart failure.
  bridge_softmix.c: Fix crash if channel fails to join mixing tech.
---

4efc6b43155452b2f9cb5f96c7aea4cdfc1a84d1