From: Travis Cross <tc@traviscross.com>
Date: Sat, 5 Apr 2014 06:42:55 +0000 (+0000)
Subject: Merge in my-basic upstream base point
X-Git-Tag: v1.5.12~244
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff966a6120784018c1699fbc0dc5aa2a9beba1ce;p=thirdparty%2Ffreeswitch.git

Merge in my-basic upstream base point
---

ff966a6120784018c1699fbc0dc5aa2a9beba1ce