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

Conflicts:
	bootstrap.css

diff --cc bootstrap.css
index f3fcca6376f3610145bbed2bcf4c09c536cd3a7d,f57423b0c79a858c067b6eba5f05b3a7850c8d8a..612fe24bc7beaaaf9f3f0a50efc1f5fe1a50b5d2
--- 1/bootstrap.css
--- 2/bootstrap.css
+++ b/bootstrap.css
@@@ -6,7 -6,7 +6,7 @@@
   * http://www.apache.org/licenses/LICENSE-2.0
   *
   * Designed and built with all the love in the world @twitter by @mdo and @fat.
-  * Date: Tue Dec 20 22:11:42 PST 2011
 - * Date: Mon Dec 19 22:58:34 PST 2011
++ * Date: Wed Dec 21 13:29:41 PST 2011
   */
  html, body {
    margin: 0;

diff --cc bootstrap.min.css
Simple merge

diff --cc docs/javascript.html
index 8dc3ba9d8d424d85a863444b031a0d007ba4322b,568991969b6517d01cc3a12ff868f7a38bdb01da..acde34d46aad87cc7c35c4d5d4a4ffea6ef178d8
--- 1/docs/javascript.html
--- 2/docs/javascript.html
+++ b/docs/javascript.html
@@@ -829,9 -819,9 +829,9 @@@ $('a[data-toggle="tab"]').on('shown', f
  <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="striped-table">
 +          <table class="bordered-table striped-table">
              <tbody>
               <tr>
                 <td>Stateful</td>