Merge "Add two hooks to allow for extensions to expose log_search values in the UI"

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

Thu, 6 Nov 2014 23:00:16 +0000 (23:00 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Thu, 6 Nov 2014 23:00:16 +0000 (23:00 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 6 Nov 2014 23:00:16 +0000 (23:00 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Thu, 6 Nov 2014 23:00:16 +0000 (23:00 +0000)
diff --cc docs/hooks.txt
Simple merge
diff --cc includes/logging/LogEventsList.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Thu, 6 Nov 2014 23:00:16 +0000 (23:00 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Thu, 6 Nov 2014 23:00:16 +0000 (23:00 +0000)
		1	2
docs/hooks.txt	patch \|	diff1 \|	diff2 \|	blob \| history
includes/logging/LogEventsList.php	patch \|	diff1 \|	diff2 \|	blob \| history