From: Joshua Colp <jcolp@digium.com>
Date: Fri, 22 Apr 2016 22:22:06 +0000 (-0500)
Subject: Merge "res_stasis: Handle re-enter stasis bridge with swap channel." into certified... 
X-Git-Tag: certified/13.1-cert7~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15ebfb181d5ed72a48cfad6890e094db32897287;p=thirdparty%2Fasterisk.git

Merge "res_stasis: Handle re-enter stasis bridge with swap channel." into certified/13.1
---

15ebfb181d5ed72a48cfad6890e094db32897287