From: Moises Silva <moy@sangoma.com>
Date: Thu, 16 Jun 2011 17:43:37 +0000 (-0400)
Subject: Merge branch 'master' into smgmaster
X-Git-Tag: v1.2.3^2~71^2^2~242
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2a9046fdb807f4ad98c15b9732901ca1ff013c9e;p=thirdparty%2Ffreeswitch.git

Merge branch 'master' into smgmaster

Conflicts:
	build/modules.conf.in
---

2a9046fdb807f4ad98c15b9732901ca1ff013c9e