From: Brian West <brian@freeswitch.org>
Date: Mon, 1 Dec 2014 21:10:06 +0000 (-0600)
Subject: Merge branch 'master' of ssh://stash.freeswitch.org:7999/fs/freeswitch
X-Git-Tag: v1.4.15^2~76
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b9c25eae2a0f996705db97194ba44c6af379b45d;p=thirdparty%2Ffreeswitch.git

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

b9c25eae2a0f996705db97194ba44c6af379b45d