From: Mark Otto <otto@github.com>
Date: Mon, 9 Dec 2013 07:56:22 +0000 (-0800)
Subject: Merge branch 'pr/11779' into drop_recess_for_less
X-Git-Tag: v3.1.0~148^2~11^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de218bbba83b83f96f62b689a56b18b3ebcd191e;p=thirdparty%2Fbootstrap.git

Merge branch 'pr/11779' into drop_recess_for_less

Conflicts:
	Gruntfile.js
	package.json
---

de218bbba83b83f96f62b689a56b18b3ebcd191e
diff --cc Gruntfile.js
index 35ad76394b,c7277cb987..36112c8404
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@@ -322,9 -307,8 +329,10 @@@ module.exports = function (grunt) 
    grunt.loadNpmTasks('grunt-contrib-concat');
    grunt.loadNpmTasks('grunt-contrib-connect');
    grunt.loadNpmTasks('grunt-contrib-copy');
+   grunt.loadNpmTasks('grunt-contrib-csslint');
 +  grunt.loadNpmTasks('grunt-contrib-cssmin');
    grunt.loadNpmTasks('grunt-contrib-jshint');
 +  grunt.loadNpmTasks('grunt-contrib-less');
    grunt.loadNpmTasks('grunt-contrib-qunit');
    grunt.loadNpmTasks('grunt-contrib-uglify');
    grunt.loadNpmTasks('grunt-contrib-watch');
diff --cc package.json
index 0d414000f3,e6adbc17e4..5cd7c90ec6
--- a/package.json
+++ b/package.json
@@@ -27,9 -26,8 +27,10 @@@
      , "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-cssmin": "~0.7.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"