Merge branch 'master' into Wikidata
authorJens Ohlig <jens.ohlig@wikimedia.de>
Wed, 11 Apr 2012 12:24:29 +0000 (14:24 +0200)
committerJens Ohlig <jens.ohlig@wikimedia.de>
Wed, 11 Apr 2012 12:24:29 +0000 (14:24 +0200)
commit10e91851b2568267e5ccb7bbd0ab24ec4f2a195a
treea0ebe8e1ad664c4bde33ef508ffff2fb3286030f
parentd8f365bb63c1f7e45e7c5d03ed0aa3b93e2518d2
parent697c683bd6fc6fecf79b123225d3d7ea370ec093
Merge branch 'master' into Wikidata

Conflicts:
.gitreview
includes/Article.php
includes/AutoLoader.php
includes/EditPage.php
includes/LinksUpdate.php
includes/WikiPage.php
includes/installer/Ibm_db2Updater.php
includes/installer/MysqlUpdater.php
includes/installer/OracleUpdater.php
includes/installer/SqliteUpdater.php
maintenance/refreshLinks.php
29 files changed:
includes/Article.php
includes/AutoLoader.php
includes/DefaultSettings.php
includes/Defines.php
includes/EditPage.php
includes/FeedUtils.php
includes/ImagePage.php
includes/LinksUpdate.php
includes/Revision.php
includes/Title.php
includes/WikiPage.php
includes/actions/RawAction.php
includes/actions/RollbackAction.php
includes/api/ApiComparePages.php
includes/api/ApiDelete.php
includes/api/ApiEditPage.php
includes/api/ApiParse.php
includes/diff/DairikiDiff.php
includes/diff/DifferenceEngine.php
includes/installer/Ibm_db2Updater.php
includes/installer/MysqlUpdater.php
includes/installer/OracleUpdater.php
includes/installer/SqliteUpdater.php
includes/parser/ParserOutput.php
includes/resourceloader/ResourceLoaderWikiModule.php
includes/specials/SpecialUndelete.php
languages/messages/MessagesEn.php
maintenance/refreshLinks.php
maintenance/tables.sql