Merge "jquery.tablesorter: Reset unaffected columns' sort counts when sorting"

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

Wed, 5 Jun 2013 11:48:07 +0000 (11:48 +0000)

committer Gerrit Code Review <gerrit@wikimedia.org>

Wed, 5 Jun 2013 11:48:07 +0000 (11:48 +0000)
author jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 5 Jun 2013 11:48:07 +0000 (11:48 +0000)
committer Gerrit Code Review <gerrit@wikimedia.org>
Wed, 5 Jun 2013 11:48:07 +0000 (11:48 +0000)
diff --cc resources/jquery/jquery.tablesorter.js
Simple merge
diff --cc tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
Simple merge
author	jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
	Wed, 5 Jun 2013 11:48:07 +0000 (11:48 +0000)
committer	Gerrit Code Review <gerrit@wikimedia.org>
	Wed, 5 Jun 2013 11:48:07 +0000 (11:48 +0000)
		1	2
resources/jquery/jquery.tablesorter.js	patch \|	diff1 \|	diff2 \|	blob \| history
tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js	patch \|	diff1 \|	diff2 \|	blob \| history