From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Sat, 10 Aug 2013 12:37:00 +0000 (+0000)
Subject: Merge "Clarify userrights-conflict"
X-Git-Tag: 1.31.0-rc.0~18998
X-Git-Url: https://git.cyclocoop.org/%27.%24link.%27?a=commitdiff_plain;h=9c2e3197b9f84ff6ede0d763c1816782923e363d;p=lhc%2Fweb%2Fwiklou.git

Merge "Clarify userrights-conflict"
---

9c2e3197b9f84ff6ede0d763c1816782923e363d