From: Michael Jerris <mike@jerris.com>
Date: Tue, 30 Mar 2010 18:25:34 +0000 (-0400)
Subject: Merge branch 'master' of gitolite:freeswitch
X-Git-Tag: v1.0.6~36
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=18094c36f71560c329d9a6fef1019c1488c0b2cf;p=thirdparty%2Ffreeswitch.git

Merge branch 'master' of gitolite:freeswitch
---

18094c36f71560c329d9a6fef1019c1488c0b2cf