Merge "Reduced the DOS potential of 404 page floods"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 22 Sep 2015 00:58:54 +0000 (00:58 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 22 Sep 2015 00:58:54 +0000 (00:58 +0000)
1  2 
includes/page/Article.php
includes/page/WikiPage.php
languages/i18n/en.json
languages/i18n/qqq.json

Simple merge
Simple merge
Simple merge
Simple merge