Merge commit '80f7dc'

# Conflicts:
#	extensions/ArchInterWiki.sql

1 files changed, 123 insertions, 258 deletions

diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 20564c68..e882cda4 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1,104 +1,46 @@
 [
     {
-        "name": "psr/log",
-        "version": "1.0.0",
+        "name": "wikimedia/composer-merge-plugin",
+        "version": "v1.0.0",
         "version_normalized": "1.0.0.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/php-fig/log.git",
-            "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b",
-            "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b",
-            "shasum": ""
-        },
-        "time": "2012-12-21 11:40:51",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-0": {
-                "Psr\\Log\\": ""
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "PHP-FIG",
-                "homepage": "http://www.php-fig.org/"
-            }
-        ],
-        "description": "Common interface for logging libraries",
-        "keywords": [
-            "log",
-            "psr",
-            "psr-3"
-        ]
-    },
-    {
-        "name": "ruflin/elastica",
-        "version": "v1.3.0.0",
-        "version_normalized": "1.3.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/ruflin/Elastica.git",
-            "reference": "92155a36c94ebe15b09661ae804acbe4bdd4ad6b"
+            "url": "https://github.com/wikimedia/composer-merge-plugin.git",
+            "reference": "ed426b785f9f786b33be4fd78584e43f4e962356"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/ruflin/Elastica/zipball/92155a36c94ebe15b09661ae804acbe4bdd4ad6b",
-            "reference": "92155a36c94ebe15b09661ae804acbe4bdd4ad6b",
+            "url": "https://api.github.com/repos/wikimedia/composer-merge-plugin/zipball/ed426b785f9f786b33be4fd78584e43f4e962356",
+            "reference": "ed426b785f9f786b33be4fd78584e43f4e962356",
             "shasum": ""
         },
         "require": {
-            "php": ">=5.3.3"
+            "composer-plugin-api": "1.0.0",
+            "php": ">=5.3.2"
         },
         "require-dev": {
-            "munkie/elasticsearch-thrift-php": "1.4.*",
-            "phpunit/phpunit": "4.1.*",
-            "psr/log": "~1.0",
-            "satooshi/php-coveralls": "dev-master"
-        },
-        "suggest": {
-            "guzzlehttp/guzzle": "Allow using guzzle 4.x as the http transport (requires php 5.4)",
-            "monolog/monolog": "Logging request",
-            "munkie/elasticsearch-thrift-php": "Allow using thrift transport",
-            "psr/log": "for logging"
+            "composer/composer": "1.0.*@dev",
+            "jakub-onderka/php-parallel-lint": "~0.8",
+            "phpspec/prophecy-phpunit": "~1.0",
+            "phpunit/phpunit": "~4.0",
+            "squizlabs/php_codesniffer": "~2.1.0"
         },
-        "time": "2014-07-27 13:45:09",
-        "type": "library",
+        "time": "2015-02-21 00:57:13",
+        "type": "composer-plugin",
         "extra": {
-            "branch-alias": {
-                "dev-master": "1.2.x-dev"
-            }
+            "class": "Wikimedia\\Composer\\MergePlugin"
         },
         "installation-source": "dist",
         "autoload": {
-            "psr-0": {
-                "Elastica": "lib/",
-                "Elastica\\Test": "test/lib/"
+            "psr-4": {
+                "Wikimedia\\Composer\\": "src/"
             }
         },
         "notification-url": "https://packagist.org/downloads/",
         "license": [
-            "Apache 2.0"
-        ],
-        "authors": [
-            {
-                "name": "Nicolas Ruflin",
-                "homepage": "http://ruflin.com/"
-            }
+            "MIT"
         ],
-        "description": "Elasticsearch Client",
-        "homepage": "http://elastica.io/",
-        "keywords": [
-            "client",
-            "search"
-        ]
+        "description": "Composer plugin to merge multiple composer.json files"
     },
     {
         "name": "cssjanus/cssjanus",
@@ -181,153 +123,115 @@
         "homepage": "http://leafo.net/lessphp/"
     },
     {
-        "name": "wikimedia/cdb",
-        "version": "1.0.1",
-        "version_normalized": "1.0.1.0",
+        "name": "liuggio/statsd-php-client",
+        "version": "v1.0.12",
+        "version_normalized": "1.0.12.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/wikimedia/cdb.git",
-            "reference": "3b7d5366c88eccf2517ebac57c59eb557c82f46c"
+            "url": "https://github.com/liuggio/statsd-php-client.git",
+            "reference": "a8c9ccd2a3af6cc49c7fc4f5f689d7b148ab19d7"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/wikimedia/cdb/zipball/3b7d5366c88eccf2517ebac57c59eb557c82f46c",
-            "reference": "3b7d5366c88eccf2517ebac57c59eb557c82f46c",
+            "url": "https://api.github.com/repos/liuggio/statsd-php-client/zipball/a8c9ccd2a3af6cc49c7fc4f5f689d7b148ab19d7",
+            "reference": "a8c9ccd2a3af6cc49c7fc4f5f689d7b148ab19d7",
             "shasum": ""
         },
         "require": {
-            "php": ">=5.3.2"
+            "php": ">=5.2"
         },
         "require-dev": {
-            "phpunit/phpunit": "*"
+            "monolog/monolog": ">=1.2.0"
         },
-        "time": "2014-12-08 19:26:44",
+        "suggest": {
+            "monolog/monolog": "Monolog, in order to do generate statistic from log >=1.2.0)"
+        },
+        "time": "2014-09-17 21:37:49",
         "type": "library",
         "installation-source": "dist",
         "autoload": {
-            "classmap": [
-                "src/"
-            ]
+            "psr-0": {
+                "Liuggio": "src/"
+            }
         },
         "notification-url": "https://packagist.org/downloads/",
         "license": [
-            "GPL-2.0"
+            "MIT"
         ],
         "authors": [
             {
-                "name": "Tim Starling",
-                "email": "tstarling@wikimedia.org"
-            },
-            {
-                "name": "Chad Horohoe",
-                "email": "chad@wikimedia.org"
+                "name": "Giulio De Donato",
+                "email": "liuggio@gmail.com"
             }
         ],
-        "description": "Constant Database (CDB) wrapper library for PHP. Provides pure-PHP fallback when dba_* functions are absent.",
-        "homepage": "https://www.mediawiki.org/wiki/CDB"
+        "description": "Statsd (Object Oriented) client library for PHP",
+        "homepage": "https://github.com/liuggio/statsd-php-client/",
+        "keywords": [
+            "etsy",
+            "monitoring",
+            "php",
+            "statsd"
+        ]
     },
     {
-        "name": "zordius/lightncandy",
-        "version": "v0.18",
-        "version_normalized": "0.18.0.0",
+        "name": "oojs/oojs-ui",
+        "version": "v0.11.3",
+        "version_normalized": "0.11.3.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/zordius/lightncandy.git",
-            "reference": "24be6909c37391f4648ce1fdf19036b11bd56d05"
+            "url": "https://github.com/wikimedia/oojs-ui.git",
+            "reference": "a03de5681e28e4fad1e27f8cccab32a2c5b484e5"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/zordius/lightncandy/zipball/24be6909c37391f4648ce1fdf19036b11bd56d05",
-            "reference": "24be6909c37391f4648ce1fdf19036b11bd56d05",
+            "url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/a03de5681e28e4fad1e27f8cccab32a2c5b484e5",
+            "reference": "a03de5681e28e4fad1e27f8cccab32a2c5b484e5",
             "shasum": ""
         },
         "require": {
-            "php": ">=5.3.0"
+            "php": ">=5.3.3"
         },
         "require-dev": {
-            "phpunit/phpunit": "4.0.17"
+            "jakub-onderka/php-parallel-lint": "0.8.*",
+            "mediawiki/mediawiki-codesniffer": "0.1.0",
+            "squizlabs/php_codesniffer": "2.1.*"
         },
-        "time": "2015-01-01 04:37:19",
+        "time": "2015-05-12 11:58:55",
         "type": "library",
         "installation-source": "dist",
         "autoload": {
             "classmap": [
-                "src/lightncandy.php"
+                "php/"
             ]
         },
         "notification-url": "https://packagist.org/downloads/",
         "license": [
             "MIT"
         ],
-        "authors": [
-            {
-                "name": "Zordius Chen",
-                "email": "zordius@yahoo-inc.com"
-            }
-        ],
-        "description": "An extremely fast PHP implementation of handlebars ( http://handlebarsjs.com/ ) and mustache ( http://mustache.github.io/ ).",
-        "homepage": "https://github.com/zordius/lightncandy",
-        "keywords": [
-            "handlebars",
-            "logicless",
-            "mustache",
-            "php",
-            "template"
-        ]
+        "description": "Provides library of common widgets, layouts, and windows.",
+        "homepage": "https://www.mediawiki.org/wiki/OOjs_UI"
     },
     {
-        "name": "monolog/monolog",
-        "version": "1.12.0",
-        "version_normalized": "1.12.0.0",
+        "name": "psr/log",
+        "version": "1.0.0",
+        "version_normalized": "1.0.0.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/Seldaek/monolog.git",
-            "reference": "1fbe8c2641f2b163addf49cc5e18f144bec6b19f"
+            "url": "https://github.com/php-fig/log.git",
+            "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/Seldaek/monolog/zipball/1fbe8c2641f2b163addf49cc5e18f144bec6b19f",
-            "reference": "1fbe8c2641f2b163addf49cc5e18f144bec6b19f",
+            "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b",
+            "reference": "fe0936ee26643249e916849d48e3a51d5f5e278b",
             "shasum": ""
         },
-        "require": {
-            "php": ">=5.3.0",
-            "psr/log": "~1.0"
-        },
-        "provide": {
-            "psr/log-implementation": "1.0.0"
-        },
-        "require-dev": {
-            "aws/aws-sdk-php": "~2.4, >2.4.8",
-            "doctrine/couchdb": "~1.0@dev",
-            "graylog2/gelf-php": "~1.0",
-            "phpunit/phpunit": "~4.0",
-            "raven/raven": "~0.5",
-            "ruflin/elastica": "0.90.*",
-            "videlalvaro/php-amqplib": "~2.4"
-        },
-        "suggest": {
-            "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
-            "doctrine/couchdb": "Allow sending log messages to a CouchDB server",
-            "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
-            "ext-mongo": "Allow sending log messages to a MongoDB server",
-            "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
-            "raven/raven": "Allow sending log messages to a Sentry server",
-            "rollbar/rollbar": "Allow sending log messages to Rollbar",
-            "ruflin/elastica": "Allow sending log messages to an Elastic Search server",
-            "videlalvaro/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib"
-        },
-        "time": "2014-12-29 21:29:35",
+        "time": "2012-12-21 11:40:51",
         "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.12.x-dev"
-            }
-        },
         "installation-source": "dist",
         "autoload": {
-            "psr-4": {
-                "Monolog\\": "src/Monolog"
+            "psr-0": {
+                "Psr\\Log\\": ""
             }
         },
         "notification-url": "https://packagist.org/downloads/",
@@ -336,112 +240,62 @@
         ],
         "authors": [
             {
-                "name": "Jordi Boggiano",
-                "email": "j.boggiano@seld.be",
-                "homepage": "http://seld.be"
+                "name": "PHP-FIG",
+                "homepage": "http://www.php-fig.org/"
             }
         ],
-        "description": "Sends your logs to files, sockets, inboxes, databases and various web services",
-        "homepage": "http://github.com/Seldaek/monolog",
+        "description": "Common interface for logging libraries",
         "keywords": [
             "log",
-            "logging",
+            "psr",
             "psr-3"
         ]
     },
     {
-        "name": "wikimedia/composer-merge-plugin",
-        "version": "v1.0.0",
-        "version_normalized": "1.0.0.0",
+        "name": "wikimedia/cdb",
+        "version": "1.0.1",
+        "version_normalized": "1.0.1.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/wikimedia/composer-merge-plugin.git",
-            "reference": "ed426b785f9f786b33be4fd78584e43f4e962356"
+            "url": "https://github.com/wikimedia/cdb.git",
+            "reference": "3b7d5366c88eccf2517ebac57c59eb557c82f46c"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/wikimedia/composer-merge-plugin/zipball/ed426b785f9f786b33be4fd78584e43f4e962356",
-            "reference": "ed426b785f9f786b33be4fd78584e43f4e962356",
+            "url": "https://api.github.com/repos/wikimedia/cdb/zipball/3b7d5366c88eccf2517ebac57c59eb557c82f46c",
+            "reference": "3b7d5366c88eccf2517ebac57c59eb557c82f46c",
             "shasum": ""
         },
         "require": {
-            "composer-plugin-api": "1.0.0",
             "php": ">=5.3.2"
         },
         "require-dev": {
-            "composer/composer": "1.0.*@dev",
-            "jakub-onderka/php-parallel-lint": "~0.8",
-            "phpspec/prophecy-phpunit": "~1.0",
-            "phpunit/phpunit": "~4.0",
-            "squizlabs/php_codesniffer": "~2.1.0"
-        },
-        "time": "2015-02-21 00:57:13",
-        "type": "composer-plugin",
-        "extra": {
-            "class": "Wikimedia\\Composer\\MergePlugin"
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Wikimedia\\Composer\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "description": "Composer plugin to merge multiple composer.json files"
-    },
-    {
-        "name": "liuggio/statsd-php-client",
-        "version": "v1.0.12",
-        "version_normalized": "1.0.12.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/liuggio/statsd-php-client.git",
-            "reference": "a8c9ccd2a3af6cc49c7fc4f5f689d7b148ab19d7"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/liuggio/statsd-php-client/zipball/a8c9ccd2a3af6cc49c7fc4f5f689d7b148ab19d7",
-            "reference": "a8c9ccd2a3af6cc49c7fc4f5f689d7b148ab19d7",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.2"
-        },
-        "require-dev": {
-            "monolog/monolog": ">=1.2.0"
-        },
-        "suggest": {
-            "monolog/monolog": "Monolog, in order to do generate statistic from log >=1.2.0)"
+            "phpunit/phpunit": "*"
         },
-        "time": "2014-09-17 21:37:49",
+        "time": "2014-12-08 19:26:44",
         "type": "library",
         "installation-source": "dist",
         "autoload": {
-            "psr-0": {
-                "Liuggio": "src/"
-            }
+            "classmap": [
+                "src/"
+            ]
         },
         "notification-url": "https://packagist.org/downloads/",
         "license": [
-            "MIT"
+            "GPL-2.0"
         ],
         "authors": [
             {
-                "name": "Giulio De Donato",
-                "email": "liuggio@gmail.com"
+                "name": "Tim Starling",
+                "email": "tstarling@wikimedia.org"
+            },
+            {
+                "name": "Chad Horohoe",
+                "email": "chad@wikimedia.org"
             }
         ],
-        "description": "Statsd (Object Oriented) client library for PHP",
-        "homepage": "https://github.com/liuggio/statsd-php-client/",
-        "keywords": [
-            "etsy",
-            "monitoring",
-            "php",
-            "statsd"
-        ]
+        "description": "Constant Database (CDB) wrapper library for PHP. Provides pure-PHP fallback when dba_* functions are absent.",
+        "homepage": "https://www.mediawiki.org/wiki/CDB"
     },
     {
         "name": "wikimedia/utfnormal",
@@ -489,41 +343,52 @@
         "homepage": "https://www.mediawiki.org/wiki/utfnormal"
     },
     {
-        "name": "oojs/oojs-ui",
-        "version": "v0.11.3",
-        "version_normalized": "0.11.3.0",
+        "name": "zordius/lightncandy",
+        "version": "v0.18",
+        "version_normalized": "0.18.0.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/wikimedia/oojs-ui.git",
-            "reference": "a03de5681e28e4fad1e27f8cccab32a2c5b484e5"
+            "url": "https://github.com/zordius/lightncandy.git",
+            "reference": "24be6909c37391f4648ce1fdf19036b11bd56d05"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/wikimedia/oojs-ui/zipball/a03de5681e28e4fad1e27f8cccab32a2c5b484e5",
-            "reference": "a03de5681e28e4fad1e27f8cccab32a2c5b484e5",
+            "url": "https://api.github.com/repos/zordius/lightncandy/zipball/24be6909c37391f4648ce1fdf19036b11bd56d05",
+            "reference": "24be6909c37391f4648ce1fdf19036b11bd56d05",
             "shasum": ""
         },
         "require": {
-            "php": ">=5.3.3"
+            "php": ">=5.3.0"
         },
         "require-dev": {
-            "jakub-onderka/php-parallel-lint": "0.8.*",
-            "mediawiki/mediawiki-codesniffer": "0.1.0",
-            "squizlabs/php_codesniffer": "2.1.*"
+            "phpunit/phpunit": "4.0.17"
         },
-        "time": "2015-05-12 11:58:55",
+        "time": "2015-01-01 04:37:19",
         "type": "library",
         "installation-source": "dist",
         "autoload": {
             "classmap": [
-                "php/"
+                "src/lightncandy.php"
             ]
         },
         "notification-url": "https://packagist.org/downloads/",
         "license": [
             "MIT"
         ],
-        "description": "Provides library of common widgets, layouts, and windows.",
-        "homepage": "https://www.mediawiki.org/wiki/OOjs_UI"
+        "authors": [
+            {
+                "name": "Zordius Chen",
+                "email": "zordius@yahoo-inc.com"
+            }
+        ],
+        "description": "An extremely fast PHP implementation of handlebars ( http://handlebarsjs.com/ ) and mustache ( http://mustache.github.io/ ).",
+        "homepage": "https://github.com/zordius/lightncandy",
+        "keywords": [
+            "handlebars",
+            "logicless",
+            "mustache",
+            "php",
+            "template"
+        ]
     }
 ]