From: Ken Rice <krice@freeswitch.org>
Date: Fri, 10 Oct 2014 21:14:44 +0000 (-0500)
Subject: Merge branch 'master' into v1.4
X-Git-Tag: v1.4.12~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f79f6fafbe13eb88843ba2a2ea3cf742ca6e6709;p=thirdparty%2Ffreeswitch.git

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

f79f6fafbe13eb88843ba2a2ea3cf742ca6e6709