From: Ken Rice <krice@freeswitch.org>
Date: Thu, 9 Oct 2014 18:40:39 +0000 (-0500)
Subject: Merge branch 'master' into v1.4
X-Git-Tag: v1.4.10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bb506c393b8271aac742c595397a2de810915bc6;p=thirdparty%2Ffreeswitch.git

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

bb506c393b8271aac742c595397a2de810915bc6