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

Conflicts:
	less/forms.less

diff --cc docs/assets/css/bootstrap.css
Simple merge

diff --cc less/forms.less
index 4a99a7793719c218a192e644d920675c342cc900,5db5f5cc3d508425e6c7c9b20aaa168998297f80..cc69e935f0c6468caa888ab66bf3aa27566cb50a
--- 1/less/forms.less
--- 2/less/forms.less
+++ b/less/forms.less
@@@ -398,15 -431,18 +394,17 @@@ select:focus:invalid 
    text-shadow: 0 1px 0 #fff;
    background-color: @gray-lighter;
    border: 1px solid #ccc;
+   border-radius: @border-radius-base;
  
 -      &.input-small {
 -        padding: @padding-small;
 -        font-size: @font-size-small;
 -    border-radius: @border-radius-small;
 -  }
 +  &.input-small {
 +    padding: @padding-small;
 +    font-size: @font-size-small;
-   }
++    border-radius: @border-radius-small;  }
    &.input-large {
      padding: @padding-large;
      font-size: @font-size-large;
 -      }
+     border-radius: @border-radius-large;
 +  }
  }
  
  // Reset rounded corners