From: Moises Silva <moy@sangoma.com>
Date: Fri, 17 Sep 2010 22:55:11 +0000 (-0400)
Subject: Merge branch 'master' into smgmaster
X-Git-Tag: v1.2.3^2~71^2^2~245^2~56
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a94590bbc743231b4f539eb785b89b73658d5f05;p=thirdparty%2Ffreeswitch.git

Merge branch 'master' into smgmaster

Conflicts:
	src/switch_core_sqldb.c
---

a94590bbc743231b4f539eb785b89b73658d5f05