Commit graph

1 commit

Author SHA1 Message Date
jaubourg
a745ac8c03 Merge branch '1.7/callbacks' of github.com:jquery/jquery into 1.7/callbacks
Conflicts:
	src/callbacks.js
	test/index.html
	test/unit/callbacks.js
2011-05-26 18:56:38 +01:00