Merge commit 'f6d65'

# Conflicts:
#	skins/ArchLinux/ArchLinux.php

1 files changed, 13 insertions, 0 deletions

diff --git a/vendor/composer/autoload_namespaces.php b/vendor/composer/autoload_namespaces.php
new file mode 100644
index 00000000..a0f180fa
--- /dev/null
+++ b/vendor/composer/autoload_namespaces.php
@@ -0,0 +1,13 @@
+<?php
+
+// autoload_namespaces.php @generated by Composer
+
+$vendorDir = dirname(dirname(__FILE__));
+$baseDir = dirname($vendorDir);
+
+return array(
+    'Psr\\Log\\' => array($vendorDir . '/psr/log'),
+    'Liuggio' => array($vendorDir . '/liuggio/statsd-php-client/src'),
+    'ComposerHookHandler' => array($baseDir . '/includes/composer'),
+    '' => array($vendorDir . '/cssjanus/cssjanus/src'),
+);