Merge branch '1.9-stable' of https://github.com/jquery/jquery into bu…

…g_12199

Gruntfile.js

@@ -24,7 +24,7 @@ module.exports = function( grunt ) {
 		selector: {
 			destFile: "src/selector.js",
 			apiFile: "src/sizzle-jquery.js",
-			srcFile: "src/sizzle/sizzle.js"
+			srcFile: "src/sizzle/dist/sizzle.js"
 		},
 		build: {
 			all:{
@@ -489,7 +489,7 @@ module.exports = function( grunt ) {
 	grunt.loadNpmTasks("grunt-contrib-uglify");
 
 	// Default grunt
-	grunt.registerTask( "default", [ "update_submodules", "selector", "build:*:*", "jshint", "uglify", "dist:*" ] );
+	grunt.registerTask( "default", [ "update_submodules", "selector", "build:*:*", "jshint", "uglify", "dist:*", "compare_size" ] );
 
 	// Short list as a high frequency watch task
 	grunt.registerTask( "dev", [ "selector", "build:*:*", "jshint" ] );

MIT-LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright 2012 jQuery Foundation and other contributors
+Copyright 2013 jQuery Foundation and other contributors
 http://jquery.com/
 
 Permission is hereby granted, free of charge, to any person obtaining

package.json

@@ -23,13 +23,13 @@
 	],
 	"dependencies": {},
 	"devDependencies": {
-		"grunt-compare-size": "0.3.1",
-		"grunt-git-authors": "1.0.0",
+		"grunt-compare-size": "~0.4.0",
+		"grunt-git-authors": "1.2.0",
 		"grunt-update-submodules": "0.2.0",
-		"grunt-contrib-watch": "0.1.4",
+		"grunt-contrib-watch": "0.3.1",
 		"grunt-contrib-jshint": "0.1.1rc6",
-		"grunt-contrib-uglify": "0.1.1rc6",
-		"grunt": "0.4.0rc5",
+		"grunt-contrib-uglify": "0.1.2",
+		"grunt": "0.4.1",
 		"testswarm": "0.2.2"
 	},
 	"keywords": []