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

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

dfd91879c4d02846d1a6868aba667a63d284d4f7