Merge branch 'eventprops.1.6final' of https://github.com/rwldrn/jquery into rwldrn...
commit2c74ee46ee6c9a08fb42e105281f59c582a26e7d
authorjeresig <jeresig@gmail.com>
Sun, 10 Apr 2011 20:28:15 +0000 (10 16:28 -0400)
committerjeresig <jeresig@gmail.com>
Sun, 10 Apr 2011 20:28:15 +0000 (10 16:28 -0400)
tree9a506bb5dc1196bff66db49c36dc96758b7ebaf7
parent7fb95ebe8f1b79220947d127a5d2b8bf56143622
parent92a4d59c3221ada339177ca860570893766a6429
Merge branch 'eventprops.1.6final' of https://github.com/rwldrn/jquery into rwldrn-eventprops.1.6final

Conflicts:
test/unit/event.js
src/event.js
test/unit/event.js