Merge branch 'master' of github.com:twitter/bootstrap into dev

Conflicts:
	bootstrap.css
	bootstrap.min.css
	lib/forms.less

1 files changed, 16 insertions, 16 deletions

diff --git a/bootstrap.min.css b/bootstrap.min.css
index c6a99a74e..2d806a639 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -141,22 +141,22 @@ form .clearfix.success .input-prepend .add-on,form .clearfix.success .input-appe
 .input-xlarge,input.xlarge,textarea.xlarge,select.xlarge{width:270px;}
 .input-xxlarge,input.xxlarge,textarea.xxlarge,select.xxlarge{width:530px;}
 textarea.xxlarge{overflow-y:auto;}
-input.span1,textarea.span1{display:inline-block;width:30px;}
-input.span2,textarea.span2{display:inline-block;width:90px;}
-input.span3,textarea.span3{display:inline-block;width:150px;}
-input.span4,textarea.span4{display:inline-block;width:210px;}
-input.span5,textarea.span5{display:inline-block;width:270px;}
-input.span6,textarea.span6{display:inline-block;width:330px;}
-input.span7,textarea.span7{display:inline-block;width:390px;}
-input.span8,textarea.span8{display:inline-block;width:450px;}
-input.span9,textarea.span9{display:inline-block;width:510px;}
-input.span10,textarea.span10{display:inline-block;width:570px;}
-input.span11,textarea.span11{display:inline-block;width:630px;}
-input.span12,textarea.span12{display:inline-block;width:690px;}
-input.span13,textarea.span13{display:inline-block;width:750px;}
-input.span14,textarea.span14{display:inline-block;width:810px;}
-input.span15,textarea.span15{display:inline-block;width:870px;}
-input.span16,textarea.span16{display:inline-block;width:930px;}
+input.span1,textarea.span1{display:inline-block;float:none;width:30px;margin-left:0;}
+input.span2,textarea.span2{display:inline-block;float:none;width:90px;margin-left:0;}
+input.span3,textarea.span3{display:inline-block;float:none;width:150px;margin-left:0;}
+input.span4,textarea.span4{display:inline-block;float:none;width:210px;margin-left:0;}
+input.span5,textarea.span5{display:inline-block;float:none;width:270px;margin-left:0;}
+input.span6,textarea.span6{display:inline-block;float:none;width:330px;margin-left:0;}
+input.span7,textarea.span7{display:inline-block;float:none;width:390px;margin-left:0;}
+input.span8,textarea.span8{display:inline-block;float:none;width:450px;margin-left:0;}
+input.span9,textarea.span9{display:inline-block;float:none;width:510px;margin-left:0;}
+input.span10,textarea.span10{display:inline-block;float:none;width:570px;margin-left:0;}
+input.span11,textarea.span11{display:inline-block;float:none;width:630px;margin-left:0;}
+input.span12,textarea.span12{display:inline-block;float:none;width:690px;margin-left:0;}
+input.span13,textarea.span13{display:inline-block;float:none;width:750px;margin-left:0;}
+input.span14,textarea.span14{display:inline-block;float:none;width:810px;margin-left:0;}
+input.span15,textarea.span15{display:inline-block;float:none;width:870px;margin-left:0;}
+input.span16,textarea.span16{display:inline-block;float:none;width:930px;margin-left:0;}
 input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{background-color:#f5f5f5;border-color:#ddd;cursor:not-allowed;}
 .actions{background:#f5f5f5;margin-top:18px;margin-bottom:18px;padding:17px 20px 18px 150px;border-top:1px solid #ddd;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;}.actions .secondary-action{float:right;}.actions .secondary-action a{line-height:30px;}.actions .secondary-action a:hover{text-decoration:underline;}
 .help-inline,.help-block{font-size:13px;line-height:18px;color:#bfbfbf;}