From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 1 May 2013 22:01:40 +0000 (+0000)
Subject: Merge "Detect user rights conflicts"
X-Git-Tag: 1.31.0-rc.0~19797
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmes_infos.php?a=commitdiff_plain;h=3222fabc4e7a9082181b39d32d641c3f0cdac5eb;p=lhc%2Fweb%2Fwiklou.git

Merge "Detect user rights conflicts"
---

3222fabc4e7a9082181b39d32d641c3f0cdac5eb