Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

less/carousel.less

@@ -158,15 +158,16 @@
   padding: 40px;
   text-shadow: 0 1px 2px rgba(0,0,0,.6);
   max-width: 60%;
-}
-.carousel-caption h3,
-.carousel-caption p {
-  color: #fff;
-  line-height: @line-height-base;
-}
-.carousel-caption h3 {
-  margin: 0 0 5px;
-}
-.carousel-caption p {
-  margin-bottom: 0;
+
+  h3,
+  p {
+    color: #fff;
+    line-height: @line-height-base;
+  }
+  h3 {
+    margin: 0 0 5px;
+  }
+  p {
+    margin-bottom: 0;
+  }
 }