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

Conflicts:
	bootstrap.css

docs/javascript.html

@@ -829,7 +829,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
 <pre class="prettyprint linenums">&lt;button class="btn" data-complete-text="finished!" &gt;...&lt;/button&gt;
 &lt;script&gt;
   $('.btn').button('complete')
-&lt;/scrip&gt;</pre>
+&lt;/script&gt;</pre>
           <h3>Demo</h3>
           <table class="bordered-table striped-table">
             <tbody>