Merge branch 'master' of http://git.local.twitter.com/baseline

diff --cc bootstrap-1.0.0.css
index 721698cb164d44a611983b7f5fc9f21f699029c4,e50f79c664c05186207381dbfc856294380d7828..8e70ac8e3f078f0b2832aec85f4bcfce898297bd
--- 1/bootstrap-1.0.0.css
--- 2/bootstrap-1.0.0.css
+++ b/bootstrap-1.0.0.css
@@@ -595,9 -628,48 +595,9 @@@ pre 
    border-radius: 3px;
    white-space: pre-wrap;
  }
 -pre.css, pre.html {
 -  background-color: #fff;
 -}
 -pre ol {
 -  background-color: #feeed6;
 -  list-style: decimal;
 -  margin: -19px;
 -  padding-left: 59px;
 -  -webkit-border-radius: 2px;
 -  -moz-border-radius: 2px;
 -  border-radius: 2px;
 -}
 -pre ol li {
 -  background-color: #fff;
 -  padding: 0 10px;
 -  border-left: 1px solid rgba(0, 0, 0, 0.1);
 -  border-left-color: #fddfb3;
 -  font-size: 11px;
 -  line-height: 20px;
 -  color: #b3b3b3;
 -  text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5);
 -  word-wrap: break-word;
 -}
 -pre ol li:first-child {
 -  padding-top: 9px;
 -}
 -pre ol li:last-child {
 -  padding-bottom: 9px;
 -}
 -span.html__tag_start, span.html__tag_end {
 -  color: #277ac1;
 -  font-weight: normal;
 -}
 -span.html__attr_name {
 -  color: #d78b41;
 -}
 -span.html__attr_value {
 -  color: #de4a3f;
 -}
  /*
   * Forms.less
-  * Base line styles for various input types, form layouts, and states
+  * Base styles for various input types, form layouts, and states
   */
  /* Global form styles
  -------------------------------------------------- */

diff --cc docs/index.html
Simple merge

diff --cc lib/forms.less
Simple merge