Merge "Make convertUserOptions.php more self-contained"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 2 Jun 2014 22:50:44 +0000 (22:50 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 2 Jun 2014 22:50:44 +0000 (22:50 +0000)
commitf853b14c4680569c9128479c36739d3051596236
treeda6d229fca4b82e08934933a6ceaa23523750adb
parent072e30f674a10a9575186dd7b38b9a2dc75695c0
parent3385d6d157638de6275a48725798d0806025a705
Merge "Make convertUserOptions.php more self-contained"
includes/User.php