Merge "Cache countable statistics to prevent multiple counting on import"

author Legoktm <legoktm.wikipedia@gmail.com>

Fri, 13 Feb 2015 19:54:17 +0000 (19:54 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Fri, 13 Feb 2015 19:54:17 +0000 (19:54 +0000)
author Legoktm <legoktm.wikipedia@gmail.com>
Fri, 13 Feb 2015 19:54:17 +0000 (19:54 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Fri, 13 Feb 2015 19:54:17 +0000 (19:54 +0000)
diff --cc includes/Import.php
Simple merge
diff --cc includes/page/WikiPage.php
Simple merge
author	Legoktm <legoktm.wikipedia@gmail.com>
	Fri, 13 Feb 2015 19:54:17 +0000 (19:54 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Fri, 13 Feb 2015 19:54:17 +0000 (19:54 +0000)
		1	2
includes/Import.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/page/WikiPage.php	patch \|	diff1 \|	diff2 \|	blob \| history