Merge "Drop in replacement of eval.php based on psysh"

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

Fri, 24 Feb 2017 01:20:16 +0000 (01:20 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Fri, 24 Feb 2017 01:20:16 +0000 (01:20 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 24 Feb 2017 01:20:16 +0000 (01:20 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Fri, 24 Feb 2017 01:20:16 +0000 (01:20 +0000)
diff --cc autoload.php
Simple merge
diff --cc composer.json
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Fri, 24 Feb 2017 01:20:16 +0000 (01:20 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Fri, 24 Feb 2017 01:20:16 +0000 (01:20 +0000)
		1	2
autoload.php	patch \|	diff1 \|	diff2 \|	blob \| history
composer.json	patch \|	diff1 \|	diff2 \|	blob \| history