Merge "Detect user rights conflicts"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 1 May 2013 22:01:40 +0000 (22:01 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 1 May 2013 22:01:40 +0000 (22:01 +0000)
1  2 
languages/messages/MessagesEn.php
languages/messages/MessagesQqq.php
maintenance/language/messages.inc

Simple merge
Simple merge
Simple merge