Merge "Deprecate static User::edits() in favour of User::getEditCount()"

author Siebrand <siebrand@wikimedia.org>

Thu, 18 Oct 2012 00:00:11 +0000 (00:00 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Thu, 18 Oct 2012 00:00:11 +0000 (00:00 +0000)
author Siebrand <siebrand@wikimedia.org>
Thu, 18 Oct 2012 00:00:11 +0000 (00:00 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Thu, 18 Oct 2012 00:00:11 +0000 (00:00 +0000)
diff --cc includes/Linker.php
Simple merge
diff --cc includes/User.php
Simple merge
author	Siebrand <siebrand@wikimedia.org>
	Thu, 18 Oct 2012 00:00:11 +0000 (00:00 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Thu, 18 Oct 2012 00:00:11 +0000 (00:00 +0000)
		1	2
includes/Linker.php	patch \|	diff1 \|	diff2 \|	blob \| history
includes/User.php	patch \|	diff1 \|	diff2 \|	blob \| history