From: Brian West <brian@freeswitch.org>
Date: Thu, 19 Feb 2015 20:31:43 +0000 (-0600)
Subject: Merge branch 'master' of ssh://stash.freeswitch.org:7999/fs/freeswitch
X-Git-Tag: v1.4.17~1^2~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5173675d9f7ffd65b5d5b7fa94b2470c13a9b42a;p=thirdparty%2Ffreeswitch.git

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

5173675d9f7ffd65b5d5b7fa94b2470c13a9b42a