Merge "remove user right 'upload_by_url' from sysop by default"

author Siebrand <s.mazeland@xs4all.nl>

Sun, 1 Jul 2012 16:10:26 +0000 (16:10 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Sun, 1 Jul 2012 16:10:27 +0000 (16:10 +0000)
author Siebrand <s.mazeland@xs4all.nl>
Sun, 1 Jul 2012 16:10:26 +0000 (16:10 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Sun, 1 Jul 2012 16:10:27 +0000 (16:10 +0000)
diff --cc RELEASE-NOTES-1.20
Simple merge
diff --cc includes/DefaultSettings.php
Simple merge
author	Siebrand <s.mazeland@xs4all.nl>
	Sun, 1 Jul 2012 16:10:26 +0000 (16:10 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Sun, 1 Jul 2012 16:10:27 +0000 (16:10 +0000)
		1	2
RELEASE-NOTES-1.20	patch \|	diff1 \|	diff2 \|	blob \| history
includes/DefaultSettings.php	patch \|	diff1 \|	diff2 \|	blob \| history