jquery/jquery — comment on commit 7f6a991313380b74d5fb18782fb6b99fd6c4a22d
File:  line 0
By rwldrn:

CONFLICT (content): Merge conflict in test/unit/event.js