From: David Yat Sin <dyatsin@sangoma.com>
Date: Wed, 15 Dec 2010 21:47:37 +0000 (-0500)
Subject: Merge branch 'master' into netborder
X-Git-Tag: v1.2-rc1~232
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47c9773048f134eff7517ed73295deb34c671aeb;p=thirdparty%2Ffreeswitch.git

Merge branch 'master' into netborder

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

47c9773048f134eff7517ed73295deb34c671aeb