Merge branch 'patch-3' of https://github.com/jholl/bootstrap into jholl-patch-3

Conflicts:
	css.html

css.html

@@ -1254,13 +1254,13 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
     <h3 id="forms-horizontal">Horizontal form</h3>
     <p>Use Bootstrap's predefined grid classes to align labels and groups of form controls in a horizontal layout.</p>
     <form class="bs-example form-horizontal">
-      <div class="row">
+      <div class="row form-group">
         <label for="inputEmail" class="col-lg-2 control-label">Email</label>
         <div class="col-lg-10">
           <input type="text" class="form-control" id="inputEmail" placeholder="Email">
         </div>
       </div>
-      <div class="row">
+      <div class="row form-group">
         <label for="inputPassword" class="col-lg-2 control-label">Password</label>
         <div class="col-lg-10">
           <input type="password" class="form-control" id="inputPassword" placeholder="Password">
@@ -1283,7 +1283,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
       <input type="text" class="form-control" id="inputEmail" placeholder="Email">
     </div>
   </div>
-  <div class="row">
+  <div class="row form-group">
     <label for="inputPassword" class="col-lg-2 control-label">Password</label>
     <div class="col-lg-10">
       <input type="password" class="form-control" id="inputPassword" placeholder="Password">

less/forms.less

@@ -421,13 +421,8 @@ select {
 // --------------------------------------------------
 // Horizontal forms are built on grid classes.
 
-.form-horizontal {
-  .row + .row {
-    margin-top: 15px;
-  }
-  .control-label {
+.form-horizontal .control-label {
     padding-top: 6px;
-  }
 }
 
 // Only right align form labels here when the columns stop stacking