Merge "Password Expiration"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 21 Feb 2014 20:28:30 +0000 (20:28 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 21 Feb 2014 20:28:30 +0000 (20:28 +0000)
1  2 
includes/User.php
languages/messages/MessagesQqq.php

Simple merge
Simple merge