From: Konrad Hammel <konrad@sangoma.com>
Date: Mon, 14 Feb 2011 21:12:41 +0000 (-0500)
Subject: Merge branch 'master' into smgmaster
X-Git-Tag: v1.2.3^2~71^2^2~245^2~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4c714895f671a3af3562fa863960c8b7a8685aa7;p=thirdparty%2Ffreeswitch.git

Merge branch 'master' into smgmaster
---

4c714895f671a3af3562fa863960c8b7a8685aa7