merged from master
authordaniel <daniel.kinzler@wikimedia.de>
Sun, 29 Apr 2012 19:41:03 +0000 (21:41 +0200)
committerdaniel <daniel.kinzler@wikimedia.de>
Sun, 29 Apr 2012 19:41:03 +0000 (21:41 +0200)
commitaf28c6f55abdf3d00b18cc44af8ca41e22955491
tree608d075eba0c86f16db260926903dbfbc2eee86a
parent4c1973e52e8d3c3b7aa6203a985ff1cdf0de6d86
parent801ede3a9b209b9203a05c03edbea81e0d1b4e7d
merged from master
14 files changed:
docs/hooks.txt
includes/AutoLoader.php
includes/DefaultSettings.php
includes/EditPage.php
includes/ImagePage.php
includes/Title.php
includes/WikiPage.php
includes/api/ApiDelete.php
includes/api/ApiEditPage.php
includes/api/ApiParse.php
includes/resourceloader/ResourceLoaderWikiModule.php
languages/messages/MessagesEn.php
maintenance/refreshLinks.php
tests/phpunit/phpunit.php