Merge "Fix some stuttering in comments and documentation"

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

Wed, 17 Dec 2014 22:28:27 +0000 (22:28 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 17 Dec 2014 22:28:27 +0000 (22:28 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 17 Dec 2014 22:28:27 +0000 (22:28 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 17 Dec 2014 22:28:27 +0000 (22:28 +0000)
diff --cc docs/hooks.txt
Simple merge
diff --cc includes/GlobalFunctions.php
Simple merge
diff --cc includes/debug/logger/legacy/Logger.php
Simple merge
diff --cc thumb.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Wed, 17 Dec 2014 22:28:27 +0000 (22:28 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 17 Dec 2014 22:28:27 +0000 (22:28 +0000)
		1	2
docs/hooks.txt	patch \|	diff1 \|	diff2 \|	blob \| history
includes/GlobalFunctions.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/debug/logger/legacy/Logger.php	patch \|	diff1 \|	diff2 \|	blob \| history
thumb.php	patch \|	diff1 \|	diff2 \|	blob \| history