Merge "Password validity by policy per group"

author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>

Wed, 10 Jun 2015 17:46:20 +0000 (17:46 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 10 Jun 2015 17:46:20 +0000 (17:46 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 10 Jun 2015 17:46:20 +0000 (17:46 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 10 Jun 2015 17:46:20 +0000 (17:46 +0000)
diff --cc autoload.php
Simple merge
diff --cc includes/User.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Wed, 10 Jun 2015 17:46:20 +0000 (17:46 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 10 Jun 2015 17:46:20 +0000 (17:46 +0000)
		1	2
autoload.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/User.php	patch \|	diff1 \|	diff2 \|	blob \| history