Merge "session: Fix phpdoc in Token::toStringAtTimestamp()"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 13 Sep 2016 05:12:13 +0000 (05:12 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 13 Sep 2016 05:12:13 +0000 (05:12 +0000)

Trivial merge