From: Ken Rice <krice@freeswitch.org>
Date: Fri, 23 Oct 2015 15:25:35 +0000 (-0500)
Subject: Merge branch 'master' into v1.6
X-Git-Tag: v1.6.4~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e60af977e8f13bbc9e275960363b7d31730fc08;p=thirdparty%2Ffreeswitch.git

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

5e60af977e8f13bbc9e275960363b7d31730fc08