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)
commit9c2e3197b9f84ff6ede0d763c1816782923e363d
tree2c518d10bfd38071f34aee45f0bb3a756c7a08ef
parentddb025fc0c5d84fe26900d056dbf7319250ea963
parentd4ccad88cf38aff9610bece18de2f5b817bc4a9e
Merge "Clarify userrights-conflict"
languages/messages/MessagesEn.php