From: David Yat Sin <dyatsin@sangoma.com>
Date: Tue, 31 May 2011 17:25:03 +0000 (-0400)
Subject: Merge branch 'master' of git.sangoma.com:smg_freeswitch
X-Git-Tag: v1.2-rc1~118
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01eb7764697b8c915e1925483a580232660cd926;p=thirdparty%2Ffreeswitch.git

Merge branch 'master' of git.sangoma.com:smg_freeswitch

Conflicts:
	libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c
---

01eb7764697b8c915e1925483a580232660cd926