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

Conflicts:
	css.html

diff --cc css.html
index f49e8bb918ae6eb17c8457c8154370e341ff5a0a,25d73ea65901bb1cd74ce0d6683049fb9e6c45c3..0401d78d025ec3e5c92164d028b45f3b27dee329
--- 1/css.html
--- 2/css.html
+++ b/css.html
@@@ -1277,13 -1277,13 +1277,13 @@@ For example, <code>&lt;section&gt;</cod
      </form>
  {% highlight html %}
  <form class="form-horizontal">
 -  <div class="row form-group">
 -    <label for="inputEmail" class="form-control" class="col-lg-2 control-label">Email</label>
 +  <div class="row">
 +    <label for="inputEmail" class="col-lg-2 control-label">Email</label>
      <div class="col-lg-10">
 -      <input type="text" id="inputEmail" placeholder="Email">
 +      <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">

diff --cc less/forms.less
Simple merge