Merge "Add way of including all stderr output when executing command"

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

Mon, 30 Sep 2013 16:03:24 +0000 (16:03 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Mon, 30 Sep 2013 16:03:24 +0000 (16:03 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 30 Sep 2013 16:03:24 +0000 (16:03 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Mon, 30 Sep 2013 16:03:24 +0000 (16:03 +0000)
diff --cc includes/GlobalFunctions.php
Simple merge
diff --cc includes/upload/UploadBase.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Mon, 30 Sep 2013 16:03:24 +0000 (16:03 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Mon, 30 Sep 2013 16:03:24 +0000 (16:03 +0000)
		1	2
includes/GlobalFunctions.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/upload/UploadBase.php	patch \|	diff1 \|	diff2 \|	blob \| history