From 7c0d07b65161ffe5f13fd2fd3bfc2398e7c1dfd3 Mon Sep 17 00:00:00 2001
From: Paul Belanger <paul.belanger@polybeacon.com>
Date: Wed, 17 Nov 2010 14:22:42 +0000
Subject: [PATCH] Merged revisions 295361 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r295361 | pabelanger | 2010-11-17 09:09:38 -0500 (Wed, 17 Nov 2010) | 2 lines

  Uncomment settings under [global], to surpress warning when loading Asterisk.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@295364 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 configs/res_curl.conf.sample | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configs/res_curl.conf.sample b/configs/res_curl.conf.sample
index 2cc92dcbd2..cc472989f2 100644
--- a/configs/res_curl.conf.sample
+++ b/configs/res_curl.conf.sample
@@ -3,6 +3,6 @@
 ;
 [globals]
 ;proxy=myproxy.example.com
-;proxytype=http
-;proxyport=8001
+proxytype=http
+proxyport=8001
 ;proxyuserpwd=asterisk:asteriskrocks