From: David Yat Sin <dyatsin@sangoma.com>
Date: Fri, 4 Mar 2011 15:35:04 +0000 (-0500)
Subject: Merge branch 'netborder' of git.sangoma.com:smg_freeswitch into netborder
X-Git-Tag: v1.2-rc1~172^2~3^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=faf1ec091aa02285c38825a66b712778d1ed60e2;p=thirdparty%2Ffreeswitch.git

Merge branch 'netborder' of git.sangoma.com:smg_freeswitch into netborder
---

faf1ec091aa02285c38825a66b712778d1ed60e2