Merge "Use a UNIX timestamp in the LoggedOut cookie"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 4 Jul 2013 06:00:18 +0000 (06:00 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 4 Jul 2013 06:00:18 +0000 (06:00 +0000)
1  2 
includes/User.php

Simple merge