Merge "Converted User touched key to using the WAN cache"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 11 May 2015 16:52:48 +0000 (16:52 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 11 May 2015 16:52:48 +0000 (16:52 +0000)
1  2 
includes/User.php

Simple merge