Merge branch 'master' of github.com:dmethvin/jquery
commit5e2ec36737e5cb7dd432e035ee8d600ddc61d895
authorDave Methvin <dave.methvin@gmail.com>
Thu, 1 Sep 2011 16:00:56 +0000 (1 12:00 -0400)
committerDave Methvin <dave.methvin@gmail.com>
Thu, 1 Sep 2011 16:00:56 +0000 (1 12:00 -0400)
tree299818bbae5e34743d904c271ab0e0eaf264f647
parentc2531e26d68df80a1544c99661c9653fc77ee6f7
parentd284b36b88b616aefc5c1645035eba4c492c2e9b
Merge branch 'master' of github.com:dmethvin/jquery

Conflicts:
version.txt