Merge changes I296d39be,I67bccf82

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

Wed, 13 Nov 2013 16:05:53 +0000 (16:05 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 13 Nov 2013 16:05:53 +0000 (16:05 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 13 Nov 2013 16:05:53 +0000 (16:05 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 13 Nov 2013 16:05:53 +0000 (16:05 +0000)
diff --cc includes/AutoLoader.php
Simple merge
diff --cc maintenance/language/StatOutputs.php
Simple merge
diff --cc maintenance/language/messages.inc
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Wed, 13 Nov 2013 16:05:53 +0000 (16:05 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 13 Nov 2013 16:05:53 +0000 (16:05 +0000)
		1	2
includes/AutoLoader.php	patch \|	diff1 \|	diff2 \|	blob \| history
maintenance/language/StatOutputs.php	patch \|	diff1 \|	diff2 \|	blob \| history
maintenance/language/messages.inc	patch \|	diff1 \|	diff2 \|	blob \| history