From: Brian West <brian@freeswitch.org>
Date: Thu, 16 Oct 2014 22:03:57 +0000 (-0500)
Subject: Merge branch 'master' of ssh://stash.freeswitch.org:7999/fs/freeswitch
X-Git-Tag: v1.4.13~1^2~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1ee4ba4d7b1fda1b0afad0508931d019a8cac87;p=thirdparty%2Ffreeswitch.git

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

f1ee4ba4d7b1fda1b0afad0508931d019a8cac87