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

less/input-groups.less

@@ -47,7 +47,7 @@
   padding: @padding-base-vertical @padding-base-horizontal;
   font-size: @font-size-base;
   font-weight: normal;
-  line-height: @line-height-base;
+  line-height: 1;
   text-align: center;
   background-color: @gray-lighter;
   border: 1px solid @input-group-addon-border-color;
@@ -58,13 +58,11 @@
     padding: @padding-small-vertical @padding-small-horizontal;
     font-size: @font-size-small;
     border-radius: @border-radius-small;
-    line-height: @line-height-small;
   }
   &.input-lg {
     padding: @padding-large-vertical @padding-large-horizontal;
     font-size: @font-size-large;
     border-radius: @border-radius-large;
-    line-height: @line-height-large;
   }
 
   // Nuke default margins from checkboxes and radios to vertically center within.