]> source.dussan.org Git - jquery.git/commitdiff
Merge branch 'master' into makefile_fixes 276/head
authorCarl Fürstenberg <azatoth@gmail.com>
Tue, 22 Mar 2011 20:55:49 +0000 (21:55 +0100)
committerCarl Fürstenberg <azatoth@gmail.com>
Tue, 22 Mar 2011 20:55:49 +0000 (21:55 +0100)
1  2 
Makefile

diff --cc Makefile
Simple merge