From: Ken Rice <krice@freeswitch.org>
Date: Thu, 18 Sep 2014 22:46:08 +0000 (-0500)
Subject: Merge branch 'master' into v1.4
X-Git-Tag: v1.4.8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04789ae35f18d0d498fc52d2448bc9ae17d9309c;p=thirdparty%2Ffreeswitch.git

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

04789ae35f18d0d498fc52d2448bc9ae17d9309c