merged master some more
authordaniel <daniel.kinzler@wikimedia.de>
Wed, 29 Aug 2012 13:36:13 +0000 (15:36 +0200)
committerdaniel <daniel.kinzler@wikimedia.de>
Wed, 29 Aug 2012 13:37:17 +0000 (15:37 +0200)
commit72952a082cdd438d0605cf77f1db0330a821ceb2
tree42e27a639ae04cafb85cafeefc91ed3bcff84e6c
parent9994968774d44ea5138ba1e324349e048d54f12a
parent84a54a63c55b345d03d12be9b81a0b36a19a0500
merged master some more

Change-Id: I53f349e42336ce0426ea1aff939853b3cd728aeb
RELEASE-NOTES-1.20
includes/AutoLoader.php
includes/EditPage.php
includes/GlobalFunctions.php
includes/Title.php
includes/diff/DifferenceEngine.php
includes/job/RefreshLinksJob.php
includes/parser/Parser.php
includes/specials/SpecialUndelete.php
languages/messages/MessagesEn.php
tests/phpunit/includes/filerepo/FileBackendTest.php