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)
1  2 
includes/User.php

Simple merge