From: David Yat Sin <dyatsin@sangoma.com>
Date: Mon, 4 Apr 2011 20:04:13 +0000 (-0400)
Subject: Merge branch 'fsorig'
X-Git-Tag: v1.2-rc1~120^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3013a9a02ac2139bfb1c487e67fd0661c1fe2f7a;p=thirdparty%2Ffreeswitch.git

Merge branch 'fsorig'
---

3013a9a02ac2139bfb1c487e67fd0661c1fe2f7a