From: Moises Silva <moy@sangoma.com>
Date: Mon, 7 May 2012 19:46:08 +0000 (-0400)
Subject: Merge remote branch 'fsorig/master'
X-Git-Tag: v1.2-rc1~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f08e2b0ec229a74ef9a75426da0eab50511da54;p=thirdparty%2Ffreeswitch.git

Merge remote branch 'fsorig/master'
---

1f08e2b0ec229a74ef9a75426da0eab50511da54
diff --cc libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c
index 75d165be1d,19d5e14f69..87ba7ed728
mode 100755,100644..100755
--- a/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c
+++ b/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c