Merge "API: Overhaul ApiResult, make format=xml not throw, and add json formatversion"

diff --cc RELEASE-NOTES-1.25
Simple merge

diff --cc autoload.php
index 92d6014,367793a..93f8e43
--- 1/autoload.php
--- 2/autoload.php
+++ b/autoload.php
@@@ -122,9 -127,9 +127,10 @@@ $wgAutoloadLocalClasses = array
        'ApiRevisionDelete' => __DIR__ . '/includes/api/ApiRevisionDelete.php',
        'ApiRollback' => __DIR__ . '/includes/api/ApiRollback.php',
        'ApiRsd' => __DIR__ . '/includes/api/ApiRsd.php',
+       'ApiSerializable' => __DIR__ . '/includes/api/ApiSerializable.php',
        'ApiSetNotificationTimestamp' => __DIR__ . '/includes/api/ApiSetNotificationTimestamp.php',
        'ApiStashEdit' => __DIR__ . '/includes/api/ApiStashEdit.php',
 +      'ApiTag' => __DIR__ . '/includes/api/ApiTag.php',
        'ApiTokens' => __DIR__ . '/includes/api/ApiTokens.php',
        'ApiUnblock' => __DIR__ . '/includes/api/ApiUnblock.php',
        'ApiUndelete' => __DIR__ . '/includes/api/ApiUndelete.php',

diff --cc includes/api/ApiBase.php
Simple merge

diff --cc includes/api/ApiEditPage.php
Simple merge

diff --cc includes/api/ApiHelp.php
Simple merge

diff --cc includes/api/ApiMain.php
Simple merge

diff --cc includes/api/ApiParamInfo.php
Simple merge

diff --cc includes/api/ApiParse.php
Simple merge

diff --cc includes/api/ApiProtect.php
Simple merge

diff --cc includes/api/ApiQueryBase.php
Simple merge

diff --cc includes/api/ApiQueryLogEvents.php
Simple merge

diff --cc includes/api/ApiQuerySiteinfo.php
Simple merge

diff --cc includes/api/ApiQueryUserInfo.php
Simple merge

diff --cc includes/api/i18n/en.json
Simple merge

diff --cc includes/api/i18n/qqq.json
Simple merge