Merge branch 'attrhooks.1.6v2' of https://github.com/timmywil/jquery into timmywil...
commitb92d2f0bc96d65c83252fa3033c37b92eb32d442
authorjeresig <jeresig@gmail.com>
Sun, 10 Apr 2011 19:41:51 +0000 (10 15:41 -0400)
committerjeresig <jeresig@gmail.com>
Sun, 10 Apr 2011 19:41:51 +0000 (10 15:41 -0400)
treeac8545d23de62865406703eb3eb7ff3bd7401d75
parentd4e4414451e15d23d7174e8eeddaa952ed0e4d73
parent3a1b4661f5b8249ce7a741084824ec5445c75719
Merge branch 'attrhooks.1.6v2' of https://github.com/timmywil/jquery into timmywil-attrhooks.1.6v2

Conflicts:
src/attributes.js
src/attributes.js