From: Demon <chadh@wikimedia.org>
Date: Fri, 13 Apr 2012 00:49:41 +0000 (+0000)
Subject: Merge "Fix https://gerrit.wikimedia.org/r/4830 , I botched the conflict resolution... 
X-Git-Tag: 1.31.0-rc.0~23919
X-Git-Url: https://git.cyclocoop.org//%22?a=commitdiff_plain;h=90b4c84ae67c3228be72c51428d87401f045dba3;p=lhc%2Fweb%2Fwiklou.git

Merge "Fix https://gerrit.wikimedia.org/r/4830 , I botched the conflict resolution there"
---

90b4c84ae67c3228be72c51428d87401f045dba3