Merge "Clarify userrights-conflict"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 10 Aug 2013 12:37:00 +0000 (12:37 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 10 Aug 2013 12:37:00 +0000 (12:37 +0000)
1  2 
languages/messages/MessagesEn.php

Simple merge