Merge remote-tracking branch 'upstream/master'

README.md

@@ -2,10 +2,10 @@
 
 ## Description
 
-Piwik is the leading Free/Libre open source Web Analytics software. 
+Piwik is the leading Free/Libre open source Web Analytics software.
 
 Piwik is a full featured PHP MySQL software program that you download and install on your own webserver. 
-At the end of the five minute installation process you will be given a JavaScript code. 
+At the end of the five minute installation process you will be given a JavaScript code.
 Simply copy and paste this tag on websites you wish to track and access your analytics reports in real time.
 
 Piwik aims to be a Free software alternative to Google Analytics, and is already used on more than 250,000 websites.

plugins/UserCountryMap/UserCountryMap.php

@@ -62,7 +62,7 @@ class Piwik_UserCountryMap extends Piwik_Plugin
     public function getJsFiles($notification)
     {
         $jsFiles = & $notification->getNotificationObject();
-        $jsFiles[] = "plugins/UserCountryMap/js/vendor/raphael-min.js";
+        $jsFiles[] = "plugins/UserCountryMap/js/vendor/raphael.min.js";
         $jsFiles[] = "plugins/UserCountryMap/js/vendor/jquery.qtip.min.js";
         $jsFiles[] = "plugins/UserCountryMap/js/vendor/kartograph.min.js";
         $jsFiles[] = "plugins/UserCountryMap/js/vendor/chroma.min.js";