merge latest master into Wikidata branch
authordaniel <daniel.kinzler@wikimedia.de>
Mon, 8 Oct 2012 11:58:54 +0000 (13:58 +0200)
committerdaniel <daniel.kinzler@wikimedia.de>
Mon, 8 Oct 2012 11:58:54 +0000 (13:58 +0200)
commitc546fae8ed67279d21daf0652349975fa034f7d1
treeeb83ff1052551930d5843e6576ae619e719119f2
parenta8f11c4001beb705bc56c0b7e127865af3afb3b4
parenta7153315a6fd6b41949098537dd2023b9754e736
merge latest master into Wikidata branch

Change-Id: Id4e0f40c03679c13d8934a6add99b5cd86d0437d
45 files changed:
RELEASE-NOTES-1.21
includes/Article.php
includes/AutoLoader.php
includes/DefaultSettings.php
includes/EditPage.php
includes/Export.php
includes/GlobalFunctions.php
includes/Message.php
includes/OutputPage.php
includes/SqlDataUpdate.php
includes/Title.php
includes/WikiPage.php
includes/actions/RollbackAction.php
includes/api/ApiDelete.php
includes/api/ApiEditPage.php
includes/api/ApiMain.php
includes/api/ApiQueryRevisions.php
includes/content/WikitextContent.php
includes/diff/DifferenceEngine.php
includes/filerepo/file/LocalFile.php
includes/installer/MysqlUpdater.php
includes/installer/SqliteUpdater.php
includes/job/DoubleRedirectJob.php
includes/parser/Parser.php
includes/parser/ParserOutput.php
includes/resourceloader/ResourceLoaderWikiModule.php
includes/search/SearchEngine.php
includes/specials/SpecialUndelete.php
includes/upload/UploadFromUrl.php
languages/Language.php
languages/LanguageConverter.php
languages/messages/MessagesDe.php
languages/messages/MessagesEn.php
languages/messages/MessagesGa.php
languages/messages/MessagesQqq.php
maintenance/Maintenance.php
maintenance/storage/testCompression.php
maintenance/tables.sql
tests/parser/parserTest.inc
tests/phpunit/MediaWikiTestCase.php
tests/phpunit/includes/LinksUpdateTest.php
tests/phpunit/includes/TitleTest.php
tests/phpunit/includes/filerepo/FileBackendTest.php
tests/phpunit/includes/search/SearchEngineTest.php
thumb.php