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)
commit5309ad3df1f7c7c5794c1b014396427fbd53a7c1
treeceb5cc3c053a102963e80118e961fa39578711c3
parent63233fa55c67151c33b02136c28ed92be79973b4
parentb1e4006b440185c7e8304c03946bb0155b0edc83
Merge "Allow for time-limited tokens"
RELEASE-NOTES-1.25
includes/User.php
tests/phpunit/includes/api/ApiTestCase.php