From: Ken Rice <krice@freeswitch.org>
Date: Fri, 9 Oct 2015 20:27:41 +0000 (-0500)
Subject: Merge branch 'master' into v1.6
X-Git-Tag: v1.6.3~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08bda5e21b82e5e166adf3dcf0baaf266554cd1f;p=thirdparty%2Ffreeswitch.git

Merge branch 'master' into v1.6
---

08bda5e21b82e5e166adf3dcf0baaf266554cd1f