Merge "Use a UNIX timestamp in the LoggedOut cookie"

diff --combined includes/User.php
index c1ca666,2e22312..bb61e80
--- 1/includes/User.php
--- 2/includes/User.php
+++ b/includes/User.php
@@@ -129,7 -129,6 +129,7 @@@ class User 
                'editmyusercss',
                'editmyuserjs',
                'editmywatchlist',
 +              'editsemiprotected',
                'editusercssjs', #deprecated
                'editusercss',
                'edituserjs',
@@@ -3147,7 -3146,7 +3147,7 @@@
                $this->clearCookie( 'forceHTTPS' );
  
                // Remember when user logged out, to prevent seeing cached pages
-               $this->setCookie( 'LoggedOut', wfTimestampNow(), time() + 86400 );
+               $this->setCookie( 'LoggedOut', time(), time() + 86400 );
        }
  
        /**