From: Ken Rice <krice@freeswitch.org>
Date: Thu, 31 Jul 2014 14:05:27 +0000 (-0500)
Subject: Merge branch 'master' into v1.4
X-Git-Tag: v1.4.8~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a96fe57ba99f65955d9c9f021be072f66e715e8;p=thirdparty%2Ffreeswitch.git

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

7a96fe57ba99f65955d9c9f021be072f66e715e8