Merge "New 'UserResetAllOptions' hook from the wikiHow codebase."

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

Thu, 10 Jul 2014 21:51:41 +0000 (21:51 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Thu, 10 Jul 2014 21:51:41 +0000 (21:51 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 10 Jul 2014 21:51:41 +0000 (21:51 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Thu, 10 Jul 2014 21:51:41 +0000 (21:51 +0000)
diff --cc docs/hooks.txt
Simple merge
diff --cc includes/User.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Thu, 10 Jul 2014 21:51:41 +0000 (21:51 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Thu, 10 Jul 2014 21:51:41 +0000 (21:51 +0000)
		1	2
docs/hooks.txt	patch \|	diff1 \|	diff2 \|	blob \| history
includes/User.php	patch \|	diff1 \|	diff2 \|	blob \| history