]> source.dussan.org Git - jquery.git/commitdiff
Merge branch 'master' of github.com:dmethvin/jquery
authorDave Methvin <dave.methvin@gmail.com>
Thu, 1 Sep 2011 16:00:56 +0000 (12:00 -0400)
committerDave Methvin <dave.methvin@gmail.com>
Thu, 1 Sep 2011 16:00:56 +0000 (12:00 -0400)
Conflicts:
version.txt


Trivial merge