From: Moises Silva <moy@sangoma.com>
Date: Mon, 7 Feb 2011 22:13:11 +0000 (-0500)
Subject: Merge remote branch 'fsorig/master'
X-Git-Tag: v1.2-rc1~172^2~24^2~2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f64b03bd8b25deb191fd456a1854b02fd73626fc;p=thirdparty%2Ffreeswitch.git

Merge remote branch 'fsorig/master'
---

f64b03bd8b25deb191fd456a1854b02fd73626fc