Merge remote branch 'upstream/master'
[jquery.git] / GPL-LICENSE.txt
2006-08-21 John ResigUpdated the licensing information.