Merge branch 'master' of github.com:twbs/bootstrap

Gruntfile.js

@@ -391,6 +391,7 @@ module.exports = function (grunt) {
 
   // These plugins provide necessary tasks.
   require('load-grunt-tasks')(grunt, {scope: 'devDependencies'});
+  require('time-grunt')(grunt);
 
   // Docs HTML validation task
   grunt.registerTask('validate-html', ['jekyll', 'validation']);

package.json

@@ -47,8 +47,8 @@
     "grunt-contrib-qunit": "~0.4.0",
     "grunt-contrib-uglify": "~0.4.0",
     "grunt-contrib-watch": "~0.5.3",
-    "grunt-css-flip": "^0.1.0",
     "grunt-csscomb": "~2.0.1",
+    "grunt-css-flip": "^0.1.0",
     "grunt-exec": "~0.4.5",
     "grunt-html-validation": "~0.1.13",
     "grunt-jekyll": "~0.4.1",
@@ -57,7 +57,10 @@
     "grunt-sed": "~0.1.1",
     "load-grunt-tasks": "~0.4.0",
     "markdown": "~0.5.0",
-    "css-flip": "~0.3.0"
+    "time-grunt": "~0.2.10"
+  },
+  "engines": {
+    "node": "~0.10.1"
   },
   "jspm": {
     "main": "js/bootstrap",