Merge "Default the "watchlisttoken" value to a derived HMAC value"

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

Tue, 8 Sep 2015 13:41:17 +0000 (13:41 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Tue, 8 Sep 2015 13:41:17 +0000 (13:41 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 8 Sep 2015 13:41:17 +0000 (13:41 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Tue, 8 Sep 2015 13:41:17 +0000 (13:41 +0000)
diff --cc RELEASE-NOTES-1.26
Simple merge
diff --cc includes/User.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Tue, 8 Sep 2015 13:41:17 +0000 (13:41 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Tue, 8 Sep 2015 13:41:17 +0000 (13:41 +0000)
		1	2
RELEASE-NOTES-1.26	patch \|	diff1 \|	diff2 \|	blob \| history
includes/User.php	patch \|	diff1 \|	diff2 \|	blob \| history