From: Jacob Thornton <jacobthornton@gmail.com>
Date: Wed, 21 Dec 2011 22:03:18 +0000 (-0800)
Subject: Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
X-Git-Tag: v2.0.0~6^2~390^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5a98a8a984512011dac1216b432b86c6eff96a4;p=thirdparty%2Fbootstrap.git

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

Conflicts:
	bootstrap.css
---

a5a98a8a984512011dac1216b432b86c6eff96a4
diff --cc bootstrap.css
index f3fcca6376,f57423b0c7..612fe24bc7
--- a/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 docs/javascript.html
index 8dc3ba9d8d,568991969b..acde34d46a
--- a/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>