From: Moises Silva <moy@sangoma.com>
Date: Fri, 25 Feb 2011 22:17:29 +0000 (-0500)
Subject: Merge remote branch 'origin/davidy.ftdm_variables3' into netborder.tmp
X-Git-Tag: v1.2-rc1~172^2~8^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=244e7c7610032cc16d48ff5a938cf90368fa9f75;p=thirdparty%2Ffreeswitch.git

Merge remote branch 'origin/davidy.ftdm_variables3' into netborder.tmp
---

244e7c7610032cc16d48ff5a938cf90368fa9f75
diff --cc libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c
index 4a817482e3,eb7df35ba0..46eb92fede
mode 100755,100644..100755
--- a/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c
+++ b/libs/freetdm/src/ftmod/ftmod_r2/ftmod_r2.c
diff --cc libs/freetdm/src/include/freetdm.h
index b1bcd46ae5,a34a2ca188..32b100319d
mode 100755,100644..100755
--- a/libs/freetdm/src/include/freetdm.h
+++ b/libs/freetdm/src/include/freetdm.h