From: Moises Silva <moy@sangoma.com>
Date: Mon, 7 May 2012 20:34:13 +0000 (-0400)
Subject: Merge remote branch 'fsorig/master'
X-Git-Tag: v1.2-rc1~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc1c47b6fe9ad998de8ab01cc4c1e73f968994e8;p=thirdparty%2Ffreeswitch.git

Merge remote branch 'fsorig/master'
---

cc1c47b6fe9ad998de8ab01cc4c1e73f968994e8