merged master after 1.20wmf3
authordaniel <daniel.kinzler@wikimedia.de>
Tue, 15 May 2012 06:46:34 +0000 (08:46 +0200)
committerdaniel <daniel.kinzler@wikimedia.de>
Tue, 15 May 2012 06:46:34 +0000 (08:46 +0200)
commit181641792a275e6b7a8bca24393d683e578fadca
treee98b2ca84e9a069f77ff04597bfbdfdb6fda6e8e
parentcf1ea333e74076a80fdd419e7a7c5919eda1fae9
parentcf11d9d95b158a640d957520c9ffd866a554126f
merged master after 1.20wmf3
docs/hooks.txt
includes/AutoLoader.php
includes/DefaultSettings.php
includes/Export.php
includes/FeedUtils.php
includes/LinksUpdate.php
includes/Namespace.php
includes/WikiPage.php
includes/api/ApiPurge.php
includes/parser/ParserOutput.php
includes/specials/SpecialUndelete.php