merged master
authordaniel <daniel.kinzler@wikimedia.de>
Tue, 18 Sep 2012 15:43:20 +0000 (17:43 +0200)
committerdaniel <daniel.kinzler@wikimedia.de>
Wed, 19 Sep 2012 10:34:10 +0000 (12:34 +0200)
commitb6b686c13b1d78525ae16150a201491c8d0b6451
tree20d29bb60aeb6605250989a1533c7af90f226920
parent855b17cf2dc7ea45bb10d3a5fa799e84a5f3fd14
parent7ccc77a33f120c3e692ba5f24a3e5084119e167a
merged master

Change-Id: I0ef7c7f33a5dc5855f38b20c03ddc5306f38ec66
21 files changed:
docs/hooks.txt
includes/Article.php
includes/DefaultSettings.php
includes/EditPage.php
includes/GlobalFunctions.php
includes/ImagePage.php
includes/Revision.php
includes/Title.php
includes/WikiPage.php
includes/api/ApiParse.php
includes/diff/DifferenceEngine.php
includes/parser/Parser.php
includes/specials/SpecialUndelete.php
languages/Language.php
languages/messages/MessagesDe.php
languages/messages/MessagesEn.php
languages/messages/MessagesQqq.php
maintenance/Maintenance.php
tests/phpunit/MediaWikiTestCase.php
tests/phpunit/includes/RevisionStorageTest.php
thumb.php