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

Conflicts:
	less/grid.less

diff --cc less/forms.less
index 2ec53f8bbc99ad2f4b6758f5d3f2a2a927a740c9,30af1692b14e3f34d97276e7011eabf7bb4f8cd6..841966bfe9a4ae6197b13586b2dc8696f14e8090
--- 1/less/forms.less
--- 2/less/forms.less
+++ b/less/forms.less
@@@ -55,9 -55,10 +55,9 @@@ input[type="search"]
  input[type="tel"],
  input[type="color"] {
    display: inline-block;
 -  .box-sizing(border-box); // Makes inputs behave like true block-level elements
    min-height: @input-height-base; // Make inputs at least the height of their button counterpart (base line-height + padding + border)
    padding: 6px 9px;
-   // margin-bottom: @line-height-base / 2;
+   // margin-bottom: (@line-height-base / 2);
    font-size: @font-size-base;
    line-height: @line-height-base;
    color: @gray;

diff --cc less/grid.less
index ded99b9bd66f8981b48825b2bd059e44f7ae2b35,01b31de67f1dfb9d58ab817172cdd0c66e955f0c..1774d90b22d0d89f22f175876a75cfc10ac8696f
--- 1/less/grid.less
--- 2/less/grid.less
+++ b/less/grid.less
@@@ -16,8 -16,12 +16,8 @@@
  }
  [class^="span"] {
    min-height: 1px;
-   padding-left:  @grid-gutter-width / 2;
-   padding-right: @grid-gutter-width / 2;
+   padding-left:  (@grid-gutter-width / 2);
+   padding-right: (@grid-gutter-width / 2);
 -  // Proper box-model (padding doesn't add to width)
 -  -webkit-box-sizing: border-box;
 -     -moz-box-sizing: border-box;
 -          box-sizing: border-box;
  }
  
  // Responsive: Tablets and up