From: Mark Otto <otto@github.com>
Date: Sun, 15 Dec 2013 22:09:50 +0000 (-0800)
Subject: Merge branch 'master' into pr/11776
X-Git-Tag: v3.1.0~148^2~6^2~7^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55f6beb4278979155549e17da6e87a2548ec0b88;p=thirdparty%2Fbootstrap.git

Merge branch 'master' into pr/11776

Conflicts:
	package.json
---

55f6beb4278979155549e17da6e87a2548ec0b88
diff --cc package.json
index d58e4a2272,2fb11848b0..f54bcb8c55
--- a/package.json
+++ b/package.json
@@@ -1,51 -1,56 +1,55 @@@
  {
-     "name": "bootstrap"
-   , "description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development."
-   , "version": "3.0.3"
-   , "keywords": ["bootstrap", "css"]
-   , "homepage": "http://getbootstrap.com"
-   , "author": "Twitter, Inc."
-   , "scripts": { "test": "grunt test" }
-   , "repository": {
+   "name": "bootstrap",
+   "description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development.",
+   "version": "3.0.3",
+   "keywords": ["bootstrap", "css"],
+   "homepage": "http://getbootstrap.com",
+   "author": "Twitter, Inc.",
+   "scripts": { "test": "grunt test" },
+   "repository": {
        "type": "git"
      , "url": "https://github.com/twbs/bootstrap.git"
-   }
-   , "bugs": {
+   },
+   "bugs": {
        "url": "https://github.com/twbs/bootstrap/issues"
-   }
-   , "licenses": [
+   },
+   "licenses": [
      {
-         "type": "Apache-2.0"
-       , "url": "http://www.apache.org/licenses/LICENSE-2.0"
-     }
-   ]
-   , "devDependencies": {
-       "btoa": "~1.1.1"
-     , "grunt": "~0.4.1"
-     , "grunt-contrib-clean": "~0.5.0"
-     , "grunt-contrib-concat": "~0.3.0"
-     , "grunt-contrib-connect": "~0.5.0"
-     , "grunt-contrib-copy": "~0.4.1"
-     , "grunt-contrib-jshint": "~0.7.0"
-     , "grunt-contrib-qunit": "~0.3.0"
-     , "grunt-contrib-uglify": "~0.2.4"
-     , "grunt-contrib-watch": "~0.5.3"
-     , "grunt-html-validation": "~0.1.6"
-     , "grunt-jekyll": "~0.4.0"
-     , "grunt-jscs-checker": "~0.2.5"
-     , "grunt-recess": "~0.5.0"
-     , "grunt-saucelabs": "~4.1.2"
-     , "grunt-sed": "~0.1.1"
-   }
-   , "jspm": {
-       "main": "js/bootstrap"
-     , "directories": { "lib": "dist" }
-     , "shim": {
-         "js/bootstrap": {
-             "imports": "jquery"
-           , "exports": "$"
-         }
+       "type": "Apache-2.0",
+       "url": "http://www.apache.org/licenses/LICENSE-2.0"
      }
-     , "buildConfig": { "uglify": true }
+   ],
+   "devDependencies": {
+     "btoa": "~1.1.1",
+     "grunt": "~0.4.1",
+     "grunt-banner": "~0.2.0",
+     "grunt-contrib-clean": "~0.5.0",
+     "grunt-contrib-concat": "~0.3.0",
+     "grunt-contrib-connect": "~0.5.0",
+     "grunt-contrib-copy": "~0.4.1",
+     "grunt-contrib-csslint": "~0.2.0",
+     "grunt-contrib-jshint": "~0.7.0",
+     "grunt-contrib-less": "~0.8.0",
+     "grunt-contrib-qunit": "~0.3.0",
+     "grunt-contrib-uglify": "~0.2.4",
+     "grunt-contrib-watch": "~0.5.3",
+     "grunt-csscomb": "~1.1.0",
+     "grunt-html-validation": "~0.1.6",
+     "grunt-jekyll": "~0.4.0",
+     "grunt-jscs-checker": "~0.2.5",
+     "grunt-saucelabs": "~4.1.2",
+     "grunt-sed": "~0.1.1",
 -    "regexp-quote": "~0.0.0",
+     "load-grunt-tasks": "~0.2.0"
+   },
+   "jspm": {
+     "main": "js/bootstrap",
+     "directories": { "lib": "dist" },
+     "shim": {
+       "js/bootstrap": {
+         "imports": "jquery",
+         "exports": "$"
+       }
+     },
+     "buildConfig": { "uglify": true }
    }
  }