Merge "Add a PSR-3 based logging interface"

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

Thu, 16 Oct 2014 23:39:22 +0000 (23:39 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Thu, 16 Oct 2014 23:39:22 +0000 (23:39 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 16 Oct 2014 23:39:22 +0000 (23:39 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Thu, 16 Oct 2014 23:39:22 +0000 (23:39 +0000)
diff --cc includes/AutoLoader.php
Simple merge
diff --cc includes/DefaultSettings.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Thu, 16 Oct 2014 23:39:22 +0000 (23:39 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Thu, 16 Oct 2014 23:39:22 +0000 (23:39 +0000)
		1	2
includes/AutoLoader.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/DefaultSettings.php	patch \|	diff1 \|	diff2 \|	blob \| history