Merge "Allow for time-limited tokens"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 22 Oct 2014 13:13:19 +0000 (13:13 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 22 Oct 2014 13:13:20 +0000 (13:13 +0000)
1  2 
RELEASE-NOTES-1.25
includes/User.php
tests/phpunit/includes/api/ApiTestCase.php

Simple merge
Simple merge