From: Moises Silva <moy@sangoma.com>
Date: Mon, 7 Feb 2011 22:26:01 +0000 (-0500)
Subject: Merge branch 'master' into smgmaster
X-Git-Tag: v1.2.3^2~71^2^2~245^2~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c41ea35739c193d49e57dcc5a046fe5e363cb19c;p=thirdparty%2Ffreeswitch.git

Merge branch 'master' into smgmaster

Conflicts:
	libs/esl/fs_cli.c
---

c41ea35739c193d49e57dcc5a046fe5e363cb19c
diff --cc libs/esl/fs_cli.c
index 254365b3c9,a70d63fab5..5a52c63085
--- a/libs/esl/fs_cli.c
+++ b/libs/esl/fs_cli.c
@@@ -8,7 -8,7 +8,8 @@@
  #include <signal.h>
  
  #define CMD_BUFLEN 1024
 +#define PROMPT_PREFIX "sangoma-media-gateway"
+ static int WARN_STOP = 0;
  
  #ifdef WIN32
  #define strdup(src) _strdup(src)