From: Ken Rice <krice@freeswitch.org>
Date: Tue, 26 May 2015 14:58:13 +0000 (-0500)
Subject: Merge branch 'master' into v1.4
X-Git-Tag: v1.4.19~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c3d33c67e3b7d293097580cfce3614f5a50a082;p=thirdparty%2Ffreeswitch.git

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

9c3d33c67e3b7d293097580cfce3614f5a50a082