]> source.dussan.org Git - jquery.git/commitdiff
Merge SlexAxton/jquery:master into jquery/jquery:master.
authorColin Snover <github.com@zetafleet.com>
Mon, 27 Dec 2010 04:08:41 +0000 (22:08 -0600)
committerColin Snover <github.com@zetafleet.com>
Mon, 27 Dec 2010 04:12:56 +0000 (22:12 -0600)
1  2 
src/data.js

diff --cc src/data.js
Simple merge