From: Travis Cross <tc@traviscross.com>
Date: Wed, 7 Apr 2010 17:30:39 +0000 (+0000)
Subject: Merge commit 'v1.0.5.14226d2'; commit 'v1.0.6'
X-Git-Tag: git2svn-syncpoint-master~245
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98fc4996ddb68b1292f528284f2c88769919d092;p=thirdparty%2Ffreeswitch.git

Merge commit 'v1.0.5.14226d2'; commit 'v1.0.6'

Merge made by -s ours
---

98fc4996ddb68b1292f528284f2c88769919d092