Merge "Only check LoggedOut timestamp on the user loaded from session"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 20 Jan 2016 21:43:25 +0000 (21:43 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 20 Jan 2016 21:43:25 +0000 (21:43 +0000)

Trivial merge