--- piwik-2.1.0.old/vendor/composer/ClassLoader.php	2014-03-04 05:31:31.000000000 +0100
+++ piwik-2.1.0.new/vendor/composer/ClassLoader.php	2014-03-29 05:35:03.000000000 +0100
@@ -291,8 +291,25 @@
             return $this->classMap[$class];
         }

+        $file = $this->findFileWithExtension($class, '.php');
+
+        // Search for Hack files if we are running on HHVM
+        if ($file === null && defined('HHVM_VERSION')) {
+            $file = $this->findFileWithExtension($class, '.hh');
+        }
+
+        if ($file === null) {
+            // Remember that this class does not exist.
+            return $this->classMap[$class] = false;
+        }
+
+        return $file;
+    }
+
+    private function findFileWithExtension($class, $ext)
+    {
         // PSR-4 lookup
-        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . '.php';
+        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;

         $first = $class[0];
         if (isset($this->prefixLengthsPsr4[$first])) {
@@ -321,7 +338,7 @@
                 . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
         } else {
             // PEAR-like class name
-            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . '.php';
+            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
         }

         if (isset($this->prefixesPsr0[$first])) {
@@ -347,9 +364,6 @@
         if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
             return $file;
         }
-
-        // Remember that this class does not exist.
-        return $this->classMap[$class] = false;
     }
 }

diff -Nur piwik-2.1.0.old/vendor/composer/autoload_real.php piwik-2.1.0.new/vendor/composer/autoload_real.php
--- piwik-2.1.0.old/vendor/composer/autoload_real.php	2014-03-04 05:31:31.000000000 +0100
+++ piwik-2.1.0.new/vendor/composer/autoload_real.php	2014-03-29 05:35:03.000000000 +0100
@@ -2,7 +2,7 @@

 // autoload_real.php @generated by Composer

-class ComposerAutoloaderInitadfdb97940eb3fa831a2c3b49ff99c17
+class ComposerAutoloaderInit6a033ff62ef4bf596a061a46f91350c7
 {
     private static $loader;

@@ -19,9 +19,9 @@
             return self::$loader;
         }

-        spl_autoload_register(array('ComposerAutoloaderInitadfdb97940eb3fa831a2c3b49ff99c17', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit6a033ff62ef4bf596a061a46f91350c7', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInitadfdb97940eb3fa831a2c3b49ff99c17', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit6a033ff62ef4bf596a061a46f91350c7', 'loadClassLoader'));

         $vendorDir = dirname(__DIR__);
         $baseDir = dirname($vendorDir);
@@ -47,7 +47,7 @@
     }
 }

-function composerRequireadfdb97940eb3fa831a2c3b49ff99c17($file)
+function composerRequire6a033ff62ef4bf596a061a46f91350c7($file)
 {
     require $file;
 }