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

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

9c76b9b4856352be58cc3ef4683ae5709c9fd2b2