Merge "(bug 45069) wfParseUrl() no longer produces a PHP notice if passed a "mailto...

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

Wed, 20 Feb 2013 15:42:16 +0000 (15:42 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 20 Feb 2013 15:42:16 +0000 (15:42 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 20 Feb 2013 15:42:16 +0000 (15:42 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 20 Feb 2013 15:42:16 +0000 (15:42 +0000)
diff --cc RELEASE-NOTES-1.21
Simple merge
diff --cc includes/GlobalFunctions.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Wed, 20 Feb 2013 15:42:16 +0000 (15:42 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 20 Feb 2013 15:42:16 +0000 (15:42 +0000)
		1	2
RELEASE-NOTES-1.21	patch \|	diff1 \|	diff2 \|	blob \| history
includes/GlobalFunctions.php	patch \|	diff1 \|	diff2 \|	blob \| history