From: Brian West <brian@freeswitch.org>
Date: Fri, 7 Nov 2014 22:45:35 +0000 (-0600)
Subject: Merge branch 'master' of ssh://stash.freeswitch.org:7999/fs/freeswitch
X-Git-Tag: v1.4.14~2^2~40
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0085bd68b7b5f2db74f1e527e366e3c151037fd3;p=thirdparty%2Ffreeswitch.git

Merge branch 'master' of ssh://stash.freeswitch.org:7999/fs/freeswitch
---

0085bd68b7b5f2db74f1e527e366e3c151037fd3