From: Konrad Hammel <konrad@sangoma.com>
Date: Mon, 18 Oct 2010 19:08:03 +0000 (-0400)
Subject: Merge branch 'master' into smgmaster
X-Git-Tag: v1.2.3^2~71^2^2~245^2~37
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1064818d9be5c5622e7562209066754d2a658f00;p=thirdparty%2Ffreeswitch.git

Merge branch 'master' into smgmaster
---

1064818d9be5c5622e7562209066754d2a658f00