From: Mark Otto <otto@github.com>
Date: Tue, 4 Mar 2014 05:52:56 +0000 (-0800)
Subject: Merge branch 'rtl_via_css_flip' of github.com:twbs/bootstrap into rtl_via_css_flip
X-Git-Tag: v3.2.0~438^2~31^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af39290a9de8b156bacfdc93d209a683f611714c;p=thirdparty%2Fbootstrap.git

Merge branch 'rtl_via_css_flip' of github.com:twbs/bootstrap into rtl_via_css_flip

Conflicts:
	Gruntfile.js
	package.json
	test-infra/npm-shrinkwrap.canonical.json
---

af39290a9de8b156bacfdc93d209a683f611714c
diff --cc package.json
index 9610cc1d4e,2e718eae22..6b1673b859
--- a/package.json
+++ b/package.json
@@@ -31,20 -26,21 +31,21 @@@
    },
    "devDependencies": {
      "btoa": "~1.1.1",
 -    "canonical-json": "~0.0.3",
 +    "canonical-json": "~0.0.4",
+     "css-flip": "~0.3.0",
      "grunt": "~0.4.2",
 -    "grunt-banner": "~0.2.0",
 +    "grunt-banner": "~0.2.1",
      "grunt-contrib-clean": "~0.5.0",
      "grunt-contrib-concat": "~0.3.0",
 -    "grunt-contrib-connect": "~0.7.0",
 +    "grunt-contrib-connect": "~0.7.1",
      "grunt-contrib-copy": "~0.5.0",
      "grunt-contrib-csslint": "~0.2.0",
 -    "grunt-contrib-cssmin": "~0.8.0",
 +    "grunt-contrib-cssmin": "~0.9.0",
      "grunt-contrib-jade": "~0.10.0",
      "grunt-contrib-jshint": "~0.8.0",
 -    "grunt-contrib-less": "~0.9.0",
 +    "grunt-contrib-less": "~0.10.0",
      "grunt-contrib-qunit": "~0.4.0",
 -    "grunt-contrib-uglify": "~0.3.0",
 +    "grunt-contrib-uglify": "~0.4.0",
      "grunt-contrib-watch": "~0.5.3",
      "grunt-csscomb": "~2.0.1",
      "grunt-exec": "~0.4.5",