From: Ken Rice <krice@freeswitch.org>
Date: Mon, 11 Jan 2016 20:14:51 +0000 (-0600)
Subject: Merge branch 'master' into v1.6
X-Git-Tag: v1.6.6~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0707c84abf85982b119495693d195e3e779d623;p=thirdparty%2Ffreeswitch.git

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

c0707c84abf85982b119495693d195e3e779d623