From: Arnaldo Pereira <arnaldo@sangoma.com>
Date: Fri, 3 Dec 2010 14:40:14 +0000 (-0200)
Subject: Merge branch 'master' into netborder
X-Git-Tag: v1.2-rc1~247
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5a9adae92e3ccf32c2a02dc32a182184c4b05d1;p=thirdparty%2Ffreeswitch.git

Merge branch 'master' into netborder

Conflicts:

	libs/freetdm/src/ftdm_io.c
	libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c
	libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.h
	libs/freetdm/src/include/freetdm.h
---

f5a9adae92e3ccf32c2a02dc32a182184c4b05d1