Merge "Don't call localisation functions when initializing pageset"

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

Fri, 9 Jan 2015 17:02:38 +0000 (17:02 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Fri, 9 Jan 2015 17:02:38 +0000 (17:02 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 9 Jan 2015 17:02:38 +0000 (17:02 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Fri, 9 Jan 2015 17:02:38 +0000 (17:02 +0000)
diff --cc autoload.php
Simple merge
diff --cc includes/api/ApiPageSet.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Fri, 9 Jan 2015 17:02:38 +0000 (17:02 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Fri, 9 Jan 2015 17:02:38 +0000 (17:02 +0000)
		1	2
autoload.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/api/ApiPageSet.php	patch \|	diff1 \|	diff2 \|	blob \| history