From: Brian West <brian@freeswitch.org>
Date: Thu, 11 Sep 2014 15:29:20 +0000 (-0500)
Subject: Merge branch 'master' of https://stash.freeswitch.org/scm/fs/freeswitch
X-Git-Tag: v1.4.8~1^2~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8afe47639e02cfce5b2a9e1975d617dba2a72f1;p=thirdparty%2Ffreeswitch.git

Merge branch 'master' of https://stash.freeswitch.org/scm/fs/freeswitch
---

c8afe47639e02cfce5b2a9e1975d617dba2a72f1