From: Ken Rice <krice@freeswitch.org>
Date: Wed, 27 May 2015 22:56:11 +0000 (-0500)
Subject: Merge branch 'master' into v1.4
X-Git-Tag: v1.4.19~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f2e272f0f510349bebb1558b2879080bbab0f61;p=thirdparty%2Ffreeswitch.git

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

0f2e272f0f510349bebb1558b2879080bbab0f61