Merge "Remove unused XMLReader2 class"

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

Sun, 27 Jul 2014 00:19:08 +0000 (00:19 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Sun, 27 Jul 2014 00:19:08 +0000 (00:19 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sun, 27 Jul 2014 00:19:08 +0000 (00:19 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Sun, 27 Jul 2014 00:19:08 +0000 (00:19 +0000)
diff --cc RELEASE-NOTES-1.24
Simple merge
diff --cc includes/Import.php
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Sun, 27 Jul 2014 00:19:08 +0000 (00:19 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Sun, 27 Jul 2014 00:19:08 +0000 (00:19 +0000)
		1	2
RELEASE-NOTES-1.24	patch \|	diff1 \|	diff2 \|	blob \| history
includes/Import.php	patch \|	diff1 \|	diff2 \|	blob \| history