Automatic merge with the upstream master branch

This commit is contained in:
Gustavo Cruz
2012-11-29 12:18:58 -04:00
144 changed files with 6902 additions and 2234 deletions

View File

@@ -50,8 +50,8 @@ class dashletRssReader implements DashletInterface
curl_setopt( $pCurl, CURLOPT_CONNECTTIMEOUT, 10 );
curl_setopt( $pCurl, CURLOPT_TIMEOUT, 20 );
curl_setopt( $pCurl, CURLOPT_NOPROGRESS, false );
curl_setopt( $pCurl, CURLOPT_VERBOSE, true );
curl_setopt( $pCurl, CURLOPT_NOPROGRESS, true );
curl_setopt( $pCurl, CURLOPT_VERBOSE, false );
//Apply proxy settings
$sysConf = System::getSystemConfiguration();