Merge "Don't break existing expiry time of "infinity" when modifying protection"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 18 Sep 2014 02:27:56 +0000 (02:27 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 18 Sep 2014 02:27:56 +0000 (02:27 +0000)
1  2 
includes/ProtectionForm.php
languages/i18n/en.json
languages/i18n/qqq.json

Simple merge
Simple merge
Simple merge