merged master some more

Change-Id: I53f349e42336ce0426ea1aff939853b3cd728aeb

diff --cc RELEASE-NOTES-1.20
Simple merge

diff --cc includes/AutoLoader.php
index 6c56e3c,9d78dbd..cb7432c
--- 1/includes/AutoLoader.php
--- 2/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@@ -1072,14 -1056,6 +1072,13 @@@ $wgAutoloadLocalClasses = array
        'TestFileIterator' => 'tests/testHelpers.inc',
        'TestRecorder' => 'tests/testHelpers.inc',
  
-       
 +      # tests/phpunit
 +      'RevisionStorageTest' => 'tests/phpunit/includes/RevisionStorageTest.php',
 +      'WikiPageTest' => 'tests/phpunit/includes/WikiPageTest.php',
 +      'WikitextContentTest' => 'tests/phpunit/includes/WikitextContentTest.php',
 +      'JavascriptContentTest' => 'tests/phpunit/includes/JavascriptContentTest.php',
 +      'DummyContentHandlerForTesting' => 'tests/phpunit/includes/ContentHandlerTest.php',
 +      'DummyContentForTesting' => 'tests/phpunit/includes/ContentHandlerTest.php',
        # tests/phpunit/includes
        'GenericArrayObjectTest' => 'tests/phpunit/includes/libs/GenericArrayObjectTest.php',
  

diff --cc includes/EditPage.php
Simple merge

diff --cc includes/GlobalFunctions.php
index 3af85ef,4ff258d..8667b67
--- 1/includes/GlobalFunctions.php
--- 2/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@@ -976,8 -1061,9 +976,10 @@@ function wfLogDBError( $text ) 
                } else {
                        $d = date_create( "now", $logDBErrorTimeZoneObject );
                }
 +              $date = $d->format( 'D M j G:i:s T Y' );
  
+               $date = $d->format( 'D M j G:i:s T Y' );
+ 
                $text = "$date\t$host\t$wiki\t$text";
                wfErrorLog( $text, $wgDBerrorLog );
        }

diff --cc includes/Title.php
Simple merge

diff --cc includes/diff/DifferenceEngine.php
Simple merge

diff --cc includes/job/RefreshLinksJob.php
Simple merge

diff --cc includes/parser/Parser.php
Simple merge

diff --cc includes/specials/SpecialUndelete.php
Simple merge

diff --cc languages/messages/MessagesEn.php
Simple merge

diff --cc tests/phpunit/includes/filerepo/FileBackendTest.php
Simple merge