From: Brian West <brian@freeswitch.org>
Date: Wed, 23 Jul 2014 19:52:29 +0000 (-0500)
Subject: Merge branch 'master' of https://stash.freeswitch.org/scm/fs/freeswitch
X-Git-Tag: v1.4.8~10^2~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a1a40b10433a175c96ea69ede01cdca6e72d1be;p=thirdparty%2Ffreeswitch.git

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

4a1a40b10433a175c96ea69ede01cdca6e72d1be