From: Arnaldo Pereira <arnaldo@sangoma.com>
Date: Thu, 16 Dec 2010 19:01:37 +0000 (-0200)
Subject: Merge branch 'master' of git@git.sangoma.com:smg_freeswitch
X-Git-Tag: v1.2-rc1~230^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37753892f1033f90bae6cbbfcedcd88d660fee9f;p=thirdparty%2Ffreeswitch.git

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

37753892f1033f90bae6cbbfcedcd88d660fee9f