From: Chris Rienzo <chris.rienzo@grasshopper.com>
Date: Thu, 30 Jan 2014 18:10:10 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.freeswitch.org:222/freeswitch
X-Git-Tag: v1.5.8~25^2~260
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9fdf803fe8fa2a02cc486885667d19c053e127f3;p=thirdparty%2Ffreeswitch.git

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

9fdf803fe8fa2a02cc486885667d19c053e127f3