Merge "TitleSquidURLs hook for changing the URLs to purge"

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

Tue, 21 May 2013 20:06:10 +0000 (20:06 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

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