From: Brian West <brian@freeswitch.org>
Date: Tue, 17 Feb 2015 16:23:44 +0000 (-0600)
Subject: Merge branch 'master' of ssh://freeswitch.org:7999/fs/freeswitch
X-Git-Tag: v1.4.17~1^2~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac17d86d923aab7bd287143cac58cc3f5324738f;p=thirdparty%2Ffreeswitch.git

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

ac17d86d923aab7bd287143cac58cc3f5324738f