From: Mark Otto <otto@github.com>
Date: Sat, 11 Jan 2014 22:48:04 +0000 (-0800)
Subject: Merge branch 'minify-assets' of https://github.com/XhmikosR/bootstrap into XhmikosR... 
X-Git-Tag: v3.1.1~14^2~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e68d3b961e8fc4cadf1db378054d4f73bb99c81b;p=thirdparty%2Fbootstrap.git

Merge branch 'minify-assets' of https://github.com/XhmikosR/bootstrap into XhmikosR-minify-assets

Conflicts:
	package.json
---

e68d3b961e8fc4cadf1db378054d4f73bb99c81b
diff --cc package.json
index 8bcd4840ef,1a7fdf465f..14d42ab7ee
--- a/package.json
+++ b/package.json
@@@ -33,7 -33,7 +33,8 @@@
      "grunt-contrib-connect": "~0.6.0",
      "grunt-contrib-copy": "~0.5.0",
      "grunt-contrib-csslint": "~0.2.0",
+     "grunt-contrib-cssmin": "~0.7.0",
 +    "grunt-contrib-jade": "~0.9.1",
      "grunt-contrib-jshint": "~0.8.0",
      "grunt-contrib-less": "~0.9.0",
      "grunt-contrib-qunit": "~0.3.0",