Merge "Allow to customise addHelpLink() target via system message"

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

Fri, 15 May 2015 10:42:51 +0000 (10:42 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Fri, 15 May 2015 10:42:51 +0000 (10:42 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 15 May 2015 10:42:51 +0000 (10:42 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Fri, 15 May 2015 10:42:51 +0000 (10:42 +0000)
diff --cc RELEASE-NOTES-1.25
Simple merge
diff --cc includes/OutputPage.php
Simple merge
diff --cc includes/page/Article.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Fri, 15 May 2015 10:42:51 +0000 (10:42 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Fri, 15 May 2015 10:42:51 +0000 (10:42 +0000)
		1	2
RELEASE-NOTES-1.25	patch \|	diff1 \|	diff2 \|	blob \| history
includes/OutputPage.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/page/Article.php	patch \|	diff1 \|	diff2 \|	blob \| history