Merge branch 'fix-7398-frameset-docs' of https://github.com/dmethvin/jquery into...
authorjeresig <jeresig@gmail.com>
Fri, 21 Jan 2011 16:22:55 +0000 (11:22 -0500)
committerjeresig <jeresig@gmail.com>
Fri, 21 Jan 2011 16:22:55 +0000 (11:22 -0500)
commit1922f311a321620f9df609503f49f41a53671ea4
treef7642aacd455438939ead72d85fa1f0d8efae033
parent61e80c55df9231c177d194ff075472898933c2c9
parentad0ebf00abca53caaaa46fb172024ba9b23b03a1
Merge branch 'fix-7398-frameset-docs' of https://github.com/dmethvin/jquery into dmethvin-fix-7398-frameset-docs