From: Moises Silva <moy@sangoma.com>
Date: Tue, 18 Jan 2011 00:15:34 +0000 (-0500)
Subject: Merge branch 'master' of git.sangoma.com:smg_freeswitch
X-Git-Tag: v1.2-rc1~199^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=99cab144b5bc0d7b304a490f27bab6a28cead815;p=thirdparty%2Ffreeswitch.git

Merge branch 'master' of git.sangoma.com:smg_freeswitch
---

99cab144b5bc0d7b304a490f27bab6a28cead815