Merge "[FileRepo] Made getDescription() respect *_deleted fields."

author Demon <chadh@wikimedia.org>

Mon, 4 Jun 2012 20:41:52 +0000 (20:41 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Mon, 4 Jun 2012 20:41:52 +0000 (20:41 +0000)
author Demon <chadh@wikimedia.org>
Mon, 4 Jun 2012 20:41:52 +0000 (20:41 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Mon, 4 Jun 2012 20:41:52 +0000 (20:41 +0000)
diff --cc includes/Export.php
Simple merge
diff --cc includes/ImagePage.php
Simple merge
diff --cc includes/Revision.php
Simple merge
diff --cc includes/filerepo/file/LocalFile.php
Simple merge
author	Demon <chadh@wikimedia.org>
	Mon, 4 Jun 2012 20:41:52 +0000 (20:41 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Mon, 4 Jun 2012 20:41:52 +0000 (20:41 +0000)
		1	2
includes/Export.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/ImagePage.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/Revision.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/filerepo/file/LocalFile.php	patch \|	diff1 \|	diff2 \|	blob \| history