Merge "Migrate block log to new log system"

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

Sun, 22 Feb 2015 00:46:35 +0000 (00:46 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Sun, 22 Feb 2015 00:46:35 +0000 (00:46 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sun, 22 Feb 2015 00:46:35 +0000 (00:46 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Sun, 22 Feb 2015 00:46:35 +0000 (00:46 +0000)
diff --cc autoload.php
Simple merge
diff --cc includes/DefaultSettings.php
Simple merge
diff --cc includes/logging/LogFormatter.php
Simple merge
diff --cc languages/i18n/en.json
Simple merge
diff --cc languages/i18n/qqq.json
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Sun, 22 Feb 2015 00:46:35 +0000 (00:46 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Sun, 22 Feb 2015 00:46:35 +0000 (00:46 +0000)
		1	2
autoload.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/DefaultSettings.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/logging/LogFormatter.php	patch \|	diff1 \|	diff2 \|	blob \| history
languages/i18n/en.json	patch \|	diff1 \|	diff2 \|	blob \| history
languages/i18n/qqq.json	patch \|	diff1 \|	diff2 \|	blob \| history