merged master
authordaniel <daniel.kinzler@wikimedia.de>
Mon, 23 Jul 2012 20:07:18 +0000 (22:07 +0200)
committerdaniel <daniel.kinzler@wikimedia.de>
Mon, 23 Jul 2012 20:07:18 +0000 (22:07 +0200)
commitd87135d706004373b2cfdc4c588ce6d80358631f
tree73385eb54fcfa88757853ef5199e2a53c31f67f7
parent83540622dec2f2de998418c7407345368d517ca9
parent4bed2c4a9515433400ec4cc25052822c8ef40640
merged master

Change-Id: Iad12ee382d6aeb1fab6fefb611d290b74865ea4b
40 files changed:
RELEASE-NOTES-1.20
docs/hooks.txt
includes/Article.php
includes/AutoLoader.php
includes/DefaultSettings.php
includes/Defines.php
includes/EditPage.php
includes/Export.php
includes/ImagePage.php
includes/Import.php
includes/LinksUpdate.php
includes/Namespace.php
includes/OutputPage.php
includes/Revision.php
includes/SqlDataUpdate.php
includes/Title.php
includes/WikiPage.php
includes/api/ApiDelete.php
includes/api/ApiEditPage.php
includes/api/ApiMain.php
includes/api/ApiParse.php
includes/api/ApiQueryRevisions.php
includes/diff/DifferenceEngine.php
includes/filerepo/file/LocalFile.php
includes/job/DoubleRedirectJob.php
includes/parser/Parser.php
includes/parser/ParserOutput.php
includes/resourceloader/ResourceLoaderWikiModule.php
includes/search/SearchEngine.php
includes/specials/SpecialBooksources.php
includes/specials/SpecialUndelete.php
languages/Language.php
languages/messages/MessagesEn.php
languages/messages/MessagesQqq.php
maintenance/cleanupSpam.php
tests/phpunit/includes/WikiPageTest.php
tests/phpunit/includes/filerepo/FileBackendTest.php
tests/phpunit/maintenance/DumpTestCase.php
tests/phpunit/maintenance/backupPrefetchTest.php
tests/phpunit/maintenance/backupTextPassTest.php