Merge "[FileRepo] Added hook to let us copy thumbnails into additional places as...

author Brion VIBBER <brion@wikimedia.org>

Thu, 26 Apr 2012 22:56:05 +0000 (22:56 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Thu, 26 Apr 2012 22:56:05 +0000 (22:56 +0000)
author Brion VIBBER <brion@wikimedia.org>
Thu, 26 Apr 2012 22:56:05 +0000 (22:56 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Thu, 26 Apr 2012 22:56:05 +0000 (22:56 +0000)
diff --cc docs/hooks.txt
Simple merge
diff --cc includes/filerepo/file/File.php
Simple merge
author	Brion VIBBER <brion@wikimedia.org>
	Thu, 26 Apr 2012 22:56:05 +0000 (22:56 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Thu, 26 Apr 2012 22:56:05 +0000 (22:56 +0000)
		1	2
docs/hooks.txt	patch \|	diff1 \|	diff2 \|	blob \| history
includes/filerepo/file/File.php	patch \|	diff1 \|	diff2 \|	blob \| history