From: Moises Silva <moy@sangoma.com>
Date: Tue, 9 Nov 2010 17:59:48 +0000 (-0500)
Subject: Merge branch 'master' of git://git.freeswitch.org/freeswitch
X-Git-Tag: v1.2-rc1~282^2~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d66f382129d7fa041a41f3c6d6d8a4d110a5771;p=thirdparty%2Ffreeswitch.git

Merge branch 'master' of git://git.freeswitch.org/freeswitch

Conflicts:
	conf/autoload_configs/modules.conf.xml
	libs/freetdm/src/ftdm_sched.c
	libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c
---

8d66f382129d7fa041a41f3c6d6d8a4d110a5771