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

Conflicts:
	dist/css/bootstrap.min.css

less/mixins.less

@@ -559,7 +559,7 @@
 }
 
 .responsive-invisibility() {
-	&,
+    &,
   tr&,
   th&,
   td& { display: none !important; }

less/navs.less

@@ -120,7 +120,7 @@
 
     // Links rendered as pills
     > a {
-      border-radius: 5px;
+      border-radius: @nav-pills-border-radius;
     }
     + li {
       margin-left: 2px;

less/normalize.less

@@ -1,4 +1,4 @@
-/*! normalize.css v2.1.0 | MIT License | git.io/normalize */
+/*! normalize.css v2.1.3 | MIT License | git.io/normalize */
 
 // ==========================================================================
 // HTML5 display definitions
@@ -44,10 +44,12 @@ audio:not([controls]) {
 }
 
 //
-// Address styling not present in IE 8/9.
+// Address `[hidden]` styling not present in IE 8/9.
+// Hide the `template` element in IE, Safari, and Firefox < 22.
 //
 
-[hidden] {
+[hidden],
+template {
   display: none;
 }
 
@@ -63,8 +65,8 @@ audio:not([controls]) {
 
 html {
   font-family: sans-serif; // 1
-  -webkit-text-size-adjust: 100%; // 2
   -ms-text-size-adjust: 100%; // 2
+  -webkit-text-size-adjust: 100%; // 2
 }
 
 //
@@ -79,6 +81,14 @@ body {
 // Links
 // ==========================================================================
 
+//
+// Remove the gray background color from active links in IE 10.
+//
+
+a {
+  background: transparent;
+}
+
 //
 // Address `outline` inconsistency between Chrome and other browsers.
 //
@@ -329,8 +339,8 @@ html input[disabled] {
 }
 
 //
-// 1. Address box sizing set to `content-box` in IE 8/9.
-// 2. Remove excess padding in IE 8/9.
+// 1. Address box sizing set to `content-box` in IE 8/9/10.
+// 2. Remove excess padding in IE 8/9/10.
 //
 
 input[type="checkbox"],

less/variables.less

@@ -336,6 +336,7 @@
 @nav-tabs-justified-active-link-border-color:     @body-bg;
 
 // Pills
+@nav-pills-border-radius:                   @border-radius-base;
 @nav-pills-active-link-hover-bg:            @component-active-bg;
 @nav-pills-active-link-hover-color:         @component-active-color;