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

diff --cc docs/index.html
index ff592e7adf94cefb8da0a369a7bf95fea6d8b605,ce28f81d4d52c4f6ec41c684f2f503388b6f6ddb..4cf68cf4dde00c82c0a53e5f793ea2e4e39ed828
--- 1/docs/index.html
--- 2/docs/index.html
+++ b/docs/index.html
@@@ -503,40 -504,40 +504,40 @@@
  <h3>Example: Zebra-striped w/ TableSorter.js</h3>
  <p>Taking the previous example, we improve the usefulness of our tables by providing sorting functionality via <a href="http://jquery.com">jQuery</a> and the <a href="http://tablesorter.com/docs/">Tablesorter</a> plugin. <strong>Click any column's header to change the sort.</strong></p>
  <table class="zebra-striped" id="sortTableExample">
-       <thead>
-               <tr>
-                       <th>#</th>
-                       <th class="yellow">First Name</th>
-                       <th class="blue">Last Name</th>
-                       <th class="green">Language</th>
-               </tr>
-       </thead>
-       <tbody>
-               <tr>
-                       <td>1</td>
-                       <td>Your</td>
-                       <td>One</td>
-                       <td>English</td>
-               </tr>
-               <tr>
-                       <td>2</td>
-                       <td>Joe</td>
-                       <td>Sixpack</td>
-                       <td>English</td>
-               </tr>
-               <tr>
-                       <td>3</td>
-                       <td>Stu</td>
-                       <td>Dent</td>
-                       <td>Code</td>
-               </tr>
-       </tbody>
+   <thead>
+     <tr>
+       <th>#</th>
+       <th class="yellow">First Name</th>
+       <th class="blue">Last Name</th>
+       <th class="green">Language</th>
+     </tr>
+   </thead>
+   <tbody>
+     <tr>
+       <td>1</td>
+       <td>Your</td>
+       <td>One</td>
+       <td>English</td>
+     </tr>
+     <tr>
+       <td>2</td>
+       <td>Joe</td>
+       <td>Sixpack</td>
+       <td>English</td>
+     </tr>
+     <tr>
+       <td>3</td>
+       <td>Stu</td>
+       <td>Dent</td>
+       <td>Code</td>
+     </tr>
+   </tbody>
  </table>
  <pre class="prettyprint linenums">
 -&lt;script type="text/javascript" src="js/jquery/jquery.tablesorter.min.js"&gt;&lt;/script&gt;
 -&lt;script type="text/javascript"&gt;
 -  $(document).ready(function() {
 -    $("table#sortTableExample").tablesorter( {sortList: [[1,0]]} );
 +&lt;script src="js/jquery/jquery.tablesorter.min.js"&gt;&lt;/script&gt;
 +&lt;script &gt;
 +  $(function() {
 +    $("table#sortTableExample").tablesorter({ sortList: [[1,0]] });
    });
  &lt;/script&gt;
  &lt;table class="common-table zebra-striped"&gt;