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

Conflicts:
	bootstrap.css

4 files changed, 9 insertions, 2 deletions

diff --git a/bootstrap.css b/bootstrap.css
index 09b7b4182..817a1ead2 100644
--- a/bootstrap.css
+++ b/bootstrap.css
@@ -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: Wed Jan 11 20:37:24 PST 2012
+ * Date: Wed Jan 11 21:43:40 PST 2012
  */
 html, body {
   margin: 0;
@@ -993,6 +993,9 @@ th {
 td {
   vertical-align: top;
 }
+tbody + tbody {
+  border-top: 2px solid #ddd;
+}
 .condensed-table th, .condensed-table td {
   padding: 4px 5px;
 }
diff --git a/bootstrap.min.css b/bootstrap.min.css
index bf7cd4200..4b5a917f2 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -179,6 +179,7 @@ table{width:100%;margin-bottom:18px;}
 th,td{padding:8px;line-height:18px;text-align:left;border-top:1px solid #ddd;}
 th{font-weight:bold;vertical-align:bottom;}
 td{vertical-align:top;}
+tbody+tbody{border-top:2px solid #ddd;}
 .condensed-table th,.condensed-table td{padding:4px 5px;}
 .bordered-table{border:1px solid #ddd;border-collapse:separate;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.bordered-table th+th,.bordered-table td+td,.bordered-table th+td,.bordered-table td+th{border-left:1px solid #ddd;}
 .bordered-table thead:first-child tr:first-child th,.bordered-table tbody:first-child tr:first-child td{border-top:0;}
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 3a0cce80a..b868fd215 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -196,7 +196,7 @@
   <div class="row">
     <div class="span4">
       <h3>Variables in LESS</h3>
-      <p>Built into Bootstrap are a handful of variables for customizing the default 940px grid system, documented above. All variables for the grid are stored in mixins.less.</p>
+      <p>Built into Bootstrap are a handful of variables for customizing the default 940px grid system, documented above. All variables for the grid are stored in variables.less.</p>
     </div>
     <div class="span4">
       <h3>How to customize</h3>
diff --git a/lib/tables.less b/lib/tables.less
index 92ac57c39..4c1fb6e07 100644
--- a/lib/tables.less
+++ b/lib/tables.less
@@ -26,6 +26,9 @@ th {
 td {
   vertical-align: top;
 }
+tbody + tbody {
+  border-top: 2px solid #ddd;
+}
 
 
 // CONDENSED TABLE W/ HALF PADDING