merged master
authordaniel <daniel.kinzler@wikimedia.de>
Tue, 29 May 2012 15:01:13 +0000 (17:01 +0200)
committerdaniel <daniel.kinzler@wikimedia.de>
Tue, 29 May 2012 15:01:13 +0000 (17:01 +0200)
commit250da851d1ab6d01a7c53a6e947b699e54b4b470
tree48410a9809d71342680ce04575f2222c519ac5a7
parent604ef15dce06d50532f76356301c41f04e6ef01c
parentd97b7d6bc1aaed01fc7d840ca1cffa52dda7c869
merged master
18 files changed:
includes/Article.php
includes/AutoLoader.php
includes/DefaultSettings.php
includes/Defines.php
includes/EditPage.php
includes/ImagePage.php
includes/Revision.php
includes/Title.php
includes/WikiPage.php
includes/api/ApiEditPage.php
includes/api/ApiMain.php
includes/api/ApiQueryRevisions.php
includes/resourceloader/ResourceLoaderWikiModule.php
languages/Language.php
languages/messages/MessagesEn.php
languages/messages/MessagesQqq.php
tests/phpunit/includes/WikiPageTest.php
tests/phpunit/includes/filerepo/FileBackendTest.php