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

Conflicts:
	dist/css/bootstrap.min.css

5 files changed, 5 insertions, 14 deletions

diff --git a/less/bootstrap.less b/less/bootstrap.less
index 1344b462f..b368b8710 100644
--- a/less/bootstrap.less
+++ b/less/bootstrap.less
@@ -1,13 +1,3 @@
-/*!
- * Bootstrap v3.0.0
- *
- * Copyright 2013 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world by @mdo and @fat.
- */
-
 // Core variables and mixins
 @import "variables.less";
 @import "mixins.less";
diff --git a/less/carousel.less b/less/carousel.less
index 9fff41e73..c66745c0b 100644
--- a/less/carousel.less
+++ b/less/carousel.less
@@ -195,7 +195,7 @@
   // Scale up the controls a smidge
   .carousel-control {
     .glyphicons-chevron-left,
-    .glyphicons-chevron-right
+    .glyphicons-chevron-right,
     .icon-prev,
     .icon-next {
       width: 30px;
diff --git a/less/code.less b/less/code.less
index f1cc4f570..88bcde552 100644
--- a/less/code.less
+++ b/less/code.less
@@ -5,7 +5,9 @@
 
 // Inline and block code styles
 code,
-pre {
+kdb,
+pre,
+samp {
   font-family: @font-family-monospace;
 }
 
diff --git a/less/forms.less b/less/forms.less
index 32391942b..cb9d30a37 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -355,7 +355,7 @@ input[type="checkbox"],
   }
 
   // Only right align form labels here when the columns stop stacking
-  @media (min-width: @screen-sm) {
+  @media (min-width: @screen-sm-min) {
     .control-label {
       text-align: right;
     }
diff --git a/less/type.less b/less/type.less
index 2f154516c..9a6656b63 100644
--- a/less/type.less
+++ b/less/type.less
@@ -264,7 +264,6 @@ blockquote:after {
 
 // Addresses
 address {
-  display: block;
   margin-bottom: @line-height-computed;
   font-style: normal;
   line-height: @line-height-base;