diff --git a/core/AssetManager.php b/core/AssetManager.php
index <HASH>..<HASH> 100644
--- a/core/AssetManager.php
+++ b/core/AssetManager.php
@@ -125,6 +125,7 @@ class Piwik_AssetManager
 		}
 
 		$mergedContent = cssmin::minify($mergedContent);
+		$mergedContent = str_replace("\n", "\r\n", $mergedContent);
 		
 		// Remove the previous file
 		self::removeMergedAsset(self::MERGED_CSS_FILE);
@@ -233,6 +234,7 @@ class Piwik_AssetManager
 			
 			$mergedContent = $mergedContent . PHP_EOL . $content;
 		}
+		$mergedContent = str_replace("\n", "\r\n", $mergedContent);
 		
 		// Remove the previous file
 		self::removeMergedAsset(self::MERGED_JS_FILE);
diff --git a/core/Http.php b/core/Http.php
index <HASH>..<HASH> 100644
--- a/core/Http.php
+++ b/core/Http.php
@@ -294,6 +294,7 @@ class Piwik_Http
 				CURLOPT_USERAGENT => 'Piwik/'.Piwik_Version::VERSION.($userAgent ? " $userAgent" : ''),
 				CURLOPT_HEADER => false,
 				CURLOPT_CONNECTTIMEOUT => $timeout,
+//				CURLOPT_CAINFO => PIWIK_INCLUDE_PATH . '/core/DataFiles/cacert.pem',
 			);
 			@curl_setopt_array($ch, $curl_options);
convert EOL on merged assets to make it more readable on Windows (when debugging)

git-svn-id: <URL>