Merge branch 'master' of github.com:jquery/jquery into deferred

author jaubourg <j@ubourg.net>

Tue, 28 Dec 2010 01:02:31 +0000 (02:02 +0100)

committer jaubourg <j@ubourg.net>

Tue, 28 Dec 2010 01:02:31 +0000 (02:02 +0100)
author jaubourg <j@ubourg.net>
Tue, 28 Dec 2010 01:02:31 +0000 (02:02 +0100)
committer jaubourg <j@ubourg.net>
Tue, 28 Dec 2010 01:02:31 +0000 (02:02 +0100)
diff --cc src/ajax.js
Simple merge
diff --cc src/core.js
Simple merge
diff --cc test/unit/core.js
Simple merge
author	jaubourg <j@ubourg.net>
	Tue, 28 Dec 2010 01:02:31 +0000 (02:02 +0100)
committer	jaubourg <j@ubourg.net>
	Tue, 28 Dec 2010 01:02:31 +0000 (02:02 +0100)
		1	2
src/ajax.js	patch \|	diff1 \|	diff2 \|	blob \| history
src/core.js	patch \|	diff1 \|	diff2 \|	blob \| history
test/unit/core.js	patch \|	diff1 \|	diff2 \|	blob \| history