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

Conflicts:
	docs/less.html
	docs/templates/pages/less.mustache

docs/less.html

@@ -398,6 +398,7 @@
 <div class="page-header" id="mixins">
   <h1>Bootstrap mixins <small></small></h1>
 </div>
+
 <h3>Mixins up the wazoo</h3>
 <p>Mixins are basically includes or partials for CSS, allowing you to combine a block of code into one. They’re great for vendor prefixed properties like <code>box-shadow</code>, cross-browser gradients, font stacks, and more. Below is a sample of the mixins that are included with Bootstrap.</p>
 <h4>Font stacks</h4>

docs/templates/pages/less.mustache

@@ -335,6 +335,7 @@
 <div class="page-header" id="mixins">
   <h1>{{_i}}Bootstrap mixins <small></small>{{/i}}</h1>
 </div>
+
 <h3>{{_i}}Mixins up the wazoo{{/i}}</h3>
 <p>{{_i}}Mixins are basically includes or partials for CSS, allowing you to combine a block of code into one. They’re great for vendor prefixed properties like <code>box-shadow</code>, cross-browser gradients, font stacks, and more. Below is a sample of the mixins that are included with Bootstrap.{{/i}}</p>
 <h4>{{_i}}Font stacks{{/i}}</h4>