From: Ken Rice <krice@freeswitch.org>
Date: Fri, 10 Oct 2014 19:35:00 +0000 (-0500)
Subject: Merge branch 'master' into v1.4
X-Git-Tag: v1.4.11~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d18c45a5fdc5da5546ec59c483e53f28d0756a52;p=thirdparty%2Ffreeswitch.git

Merge branch 'master' into v1.4
---

d18c45a5fdc5da5546ec59c483e53f28d0756a52