From: Ken Rice <krice@freeswitch.org>
Date: Thu, 12 Mar 2015 18:53:07 +0000 (-0500)
Subject: Merge branch 'master' into v1.4
X-Git-Tag: v1.4.18~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1ed0618fd80e991b6c0e27ef19720c07e722bc7;p=thirdparty%2Ffreeswitch.git

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

c1ed0618fd80e991b6c0e27ef19720c07e722bc7