From: Chris Rienzo <chris.rienzo@grasshopper.com>
Date: Fri, 21 Feb 2014 20:27:40 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.freeswitch.org:222/freeswitch
X-Git-Tag: v1.5.8~25^2~92
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36f1e5e2bb60476875ef7bc1f81bf578ba3b88d3;p=thirdparty%2Ffreeswitch.git

Merge branch 'master' of ssh://git.freeswitch.org:222/freeswitch
---

36f1e5e2bb60476875ef7bc1f81bf578ba3b88d3