From: Brian West <brian@freeswitch.org>
Date: Wed, 18 Jun 2014 13:58:56 +0000 (-0500)
Subject: Merge branch 'master' of ssh://git.freeswitch.org/freeswitch
X-Git-Tag: v1.5.13~129
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7340b7a9170435fa963d05ba5dbfc9f731bf183d;p=thirdparty%2Ffreeswitch.git

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

7340b7a9170435fa963d05ba5dbfc9f731bf183d