From: Travis Cross <tc@traviscross.com>
Date: Tue, 12 Aug 2014 20:02:33 +0000 (+0000)
Subject: Merge master into v1.4
X-Git-Tag: v1.4.8~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=912c3652d2bbad8989e74bb77a1dd514940df892;p=thirdparty%2Ffreeswitch.git

Merge master into v1.4
---

912c3652d2bbad8989e74bb77a1dd514940df892