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

Merge branch 'master' into gsm.merge
---

cf9f93707992237ffd030d474767e2b3a586dd81