From: Moises Silva <moy@sangoma.com>
Date: Thu, 24 Mar 2011 23:08:24 +0000 (-0400)
Subject: Merge branch 'master' into smgmaster
X-Git-Tag: v1.2.3^2~71^2^2~245^2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf23a0a38b22914a62596639d77f274e3e2ee665;p=thirdparty%2Ffreeswitch.git

Merge branch 'master' into smgmaster
---

bf23a0a38b22914a62596639d77f274e3e2ee665