Merge commit 'f6d65'

# Conflicts:
#	skins/ArchLinux/ArchLinux.php

1 files changed, 26 insertions, 0 deletions

diff --git a/vendor/wikimedia/cdb/composer.json b/vendor/wikimedia/cdb/composer.json
new file mode 100644
index 00000000..2134d2f7
--- /dev/null
+++ b/vendor/wikimedia/cdb/composer.json
@@ -0,0 +1,26 @@
+{
+    "name": "wikimedia/cdb",
+    "description": "Constant Database (CDB) wrapper library for PHP. Provides pure-PHP fallback when dba_* functions are absent.",
+    "license": "GPL-2.0",
+    "homepage": "https://www.mediawiki.org/wiki/CDB",
+    "authors": [
+        {
+            "name": "Tim Starling",
+            "email": "tstarling@wikimedia.org"
+        },
+        {
+            "name": "Chad Horohoe",
+            "email": "chad@wikimedia.org"
+        }
+    ],
+    "minimum-stability": "dev",
+    "require": {
+        "php": ">=5.3.2"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "*"
+    },
+    "autoload": {
+        "classmap": ["src/"]
+    }
+}