Merge "Use the request object provided in User::setCookies"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 20 Feb 2015 22:19:10 +0000 (22:19 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 20 Feb 2015 22:19:10 +0000 (22:19 +0000)
1  2 
includes/User.php

Simple merge