Merge branch 'master' of github.com:twbs/bootstrap

Conflicts:
	css.html

css.html

@@ -1847,7 +1847,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
       </form>
     </div><!-- /.bs-example -->
 {% highlight html %}
-<form class="form-inline" role="form">
+<form role="form">
   <fieldset disabled>
     <div class="form-group">
       <label for="disabledTextInput">Disabled input</label>