Merge "Use distinct log actions for patrol"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 25 Mar 2016 22:15:34 +0000 (22:15 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 25 Mar 2016 22:15:34 +0000 (22:15 +0000)
1  2 
includes/DefaultSettings.php
languages/i18n/en.json
languages/i18n/qqq.json

Simple merge
Simple merge
Simple merge