Merge "Made User::touch no longer call load()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 3 Jun 2015 07:47:00 +0000 (07:47 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 3 Jun 2015 07:47:00 +0000 (07:47 +0000)
1  2 
includes/User.php

Simple merge