From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Mon, 2 Jun 2014 22:50:44 +0000 (+0000)
Subject: Merge "Make convertUserOptions.php more self-contained"
X-Git-Tag: 1.31.0-rc.0~15501
X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=f853b14c4680569c9128479c36739d3051596236;p=lhc%2Fweb%2Fwiklou.git

Merge "Make convertUserOptions.php more self-contained"
---

f853b14c4680569c9128479c36739d3051596236