merged master (2012-09-11)
authordaniel <daniel.kinzler@wikimedia.de>
Tue, 11 Sep 2012 09:43:02 +0000 (11:43 +0200)
committerdaniel <daniel.kinzler@wikimedia.de>
Tue, 11 Sep 2012 09:43:02 +0000 (11:43 +0200)
commit12166f46b4d63d3fd3cab68cf4c7090a1646dd09
tree3fef7b6a3837de53b7a00480bb26e39ca421306f
parent625bd92c262fb37e845fca1b2666201b30903e7d
parente40a90f0bcbab65a8e0c4bf9d9a12285bd510215
merged master (2012-09-11)

Change-Id: I8e953eaa22f9d331b0af5e780fbeff6d702b23e3
21 files changed:
docs/hooks.txt
includes/Article.php
includes/Content.php
includes/EditPage.php
includes/GlobalFunctions.php
includes/ImagePage.php
includes/LinksUpdate.php
includes/OutputPage.php
includes/Title.php
includes/WikiPage.php
includes/api/ApiMain.php
includes/filerepo/file/LocalFile.php
includes/installer/MysqlUpdater.php
includes/installer/SqliteUpdater.php
includes/search/SearchEngine.php
languages/messages/MessagesDe.php
languages/messages/MessagesEn.php
languages/messages/MessagesQqq.php
maintenance/tables.sql
tests/phpunit/includes/WikitextContentTest.php
tests/phpunit/maintenance/backupTextPassTest.php