Merge "Adds the SidebarBeforeOutput hook"

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

Sat, 10 May 2014 18:30:25 +0000 (18:30 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Sat, 10 May 2014 18:30:25 +0000 (18:30 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 10 May 2014 18:30:25 +0000 (18:30 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Sat, 10 May 2014 18:30:25 +0000 (18:30 +0000)
diff --cc RELEASE-NOTES-1.24
Simple merge
diff --cc docs/hooks.txt
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Sat, 10 May 2014 18:30:25 +0000 (18:30 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Sat, 10 May 2014 18:30:25 +0000 (18:30 +0000)
		1	2
RELEASE-NOTES-1.24	patch \|	diff1 \|	diff2 \|	blob \| history
docs/hooks.txt	patch \|	diff1 \|	diff2 \|	blob \| history