Merge "Revert "Split editcascadeprotected permission from protect permission""

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

Thu, 12 May 2016 21:53:41 +0000 (21:53 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Thu, 12 May 2016 21:53:41 +0000 (21:53 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 12 May 2016 21:53:41 +0000 (21:53 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Thu, 12 May 2016 21:53:41 +0000 (21:53 +0000)
diff --cc includes/DefaultSettings.php
Simple merge
diff --cc includes/Title.php
Simple merge
diff --cc includes/user/User.php
Simple merge
diff --cc languages/i18n/en.json
Simple merge
diff --cc languages/i18n/qqq.json
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Thu, 12 May 2016 21:53:41 +0000 (21:53 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Thu, 12 May 2016 21:53:41 +0000 (21:53 +0000)
		1	2
includes/DefaultSettings.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/Title.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/user/User.php	patch \|	diff1 \|	diff2 \|	blob \| history
languages/i18n/en.json	patch \|	diff1 \|	diff2 \|	blob \| history
languages/i18n/qqq.json	patch \|	diff1 \|	diff2 \|	blob \| history