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

docs/sitemap.xml

@@ -1,6 +1,7 @@
 ---
 layout: nil
 ---
+
 <?xml version="1.0" encoding="UTF-8"?>
 <urlset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd" xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
   <url>

package.json

@@ -32,9 +32,9 @@
   "devDependencies": {
     "btoa": "~1.1.1",
     "canonical-json": "~0.0.4",
-    "grunt": "~0.4.3",
+    "grunt": "~0.4.4",
     "grunt-autoprefixer": "~0.7.2",
-    "grunt-banner": "~0.2.1",
+    "grunt-banner": "~0.2.2",
     "grunt-contrib-clean": "~0.5.0",
     "grunt-contrib-concat": "~0.3.0",
     "grunt-contrib-connect": "~0.7.1",
@@ -42,13 +42,13 @@
     "grunt-contrib-csslint": "~0.2.0",
     "grunt-contrib-cssmin": "~0.9.0",
     "grunt-contrib-jade": "~0.11.0",
-    "grunt-contrib-jshint": "~0.9.0",
+    "grunt-contrib-jshint": "~0.9.2",
     "grunt-contrib-less": "~0.10.0",
     "grunt-contrib-qunit": "~0.4.0",
     "grunt-contrib-uglify": "~0.4.0",
     "grunt-contrib-watch": "~0.6.0",
     "grunt-csscomb": "~2.0.1",
-    "grunt-css-flip": "~0.2.0",
+    "grunt-css-flip": "~0.2.1",
     "grunt-exec": "~0.4.5",
     "grunt-html-validation": "~0.1.13",
     "grunt-jekyll": "~0.4.1",