Merge "Explain API action=parse&disablepp option more clearly"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 8 Jul 2015 00:42:00 +0000 (00:42 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 8 Jul 2015 00:42:00 +0000 (00:42 +0000)
1  2 
includes/api/i18n/en.json

Simple merge