Merge "Revert "Revert "Make enhanced recent changes and extended watchlist default"""

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

Tue, 21 Oct 2014 20:03:10 +0000 (20:03 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Tue, 21 Oct 2014 20:03:10 +0000 (20:03 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 21 Oct 2014 20:03:10 +0000 (20:03 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Tue, 21 Oct 2014 20:03:10 +0000 (20:03 +0000)
diff --cc RELEASE-NOTES-1.25
Simple merge
diff --cc includes/DefaultSettings.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Tue, 21 Oct 2014 20:03:10 +0000 (20:03 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Tue, 21 Oct 2014 20:03:10 +0000 (20:03 +0000)
		1	2
RELEASE-NOTES-1.25	patch \|	diff1 \|	diff2 \|	blob \| history
includes/DefaultSettings.php	patch \|	diff1 \|	diff2 \|	blob \| history