Project "FreeSWITCH Source" received a push.

branch: master updated

       via: 25f9bba3743c72970c3285509129b09d93b6c22b (commit)
       via: b6afdadc82a3d9c95ff61bad4a7f869d220cd0f9 (commit)
       via: c339d6f2e1e8111da4150974ca324d3c3b9393c0 (commit)
       via: 14e931ffbb1d0e3196420b0eceb7a21fcd09abf4 (commit)
      from: c467886267db6b842b9bed9f50ee812d4ee427e4 (commit)
= COMMIT LOG =========================================================== 
committer: David Yat Sin
comments: 
Merge branch 'master' into netborder

committer: Moises Silva
comments: 
no test

diff --git a/libs/freetdm/src/ftdm_io.c b/libs/freetdm/src/ftdm_io.c
index 3ac9f4c..529a30f 100644
--- a/libs/freetdm/src/ftdm_io.c
+++ b/libs/freetdm/src/ftdm_io.c
@@ -37,10 +37,6 @@
  *
  */
 
-#ifdef MOYTEST
-crap
-#endif
-
 #define _GNU_SOURCE
 #include "private/ftdm_core.h"
 #include <stdarg.h>

committer: Moises Silva
comments: 
test

diff --git a/libs/freetdm/src/ftdm_io.c b/libs/freetdm/src/ftdm_io.c
index 529a30f..3ac9f4c 100644
--- a/libs/freetdm/src/ftdm_io.c
+++ b/libs/freetdm/src/ftdm_io.c
@@ -37,6 +37,10 @@
  *
  */
 
+#ifdef MOYTEST
+crap
+#endif
+
 #define _GNU_SOURCE
 #include "private/ftdm_core.h"
 #include <stdarg.h>

committer: David Yat Sin
comments: 
Merge branch 'master' of git://git.freeswitch.org/freeswitch into netborder
========================================================================

Summary of changes:

this email was generated because of /git/your-repo.git/hooks/post-receive by the file /git-core/contrib/hooks/post-receive-email
For more info, see http://blog.chomperstomp.com/?p=630 --
FreeSWITCH Source