Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

mdo · mdo · commit d195d5989f2e · 2013-08-19T08:58:59.000-07:00
diff --git a/components.html b/components.html
@@ -248,7 +248,7 @@ <h2 id="glyphicons-examples">Examples</h2>
 {% highlight html %}
 <button type="button" class="btn btn-default btn-lg">
   <span class="glyphicon glyphicon-star"></span> Star
-</a>
+</button>
 {% endhighlight %}
 
   </div>
diff --git a/less/panels.less b/less/panels.less
@@ -25,9 +25,6 @@
 // any kind of custom content between the two.
 
 .panel {
-  > .table {
-    margin-bottom: 0;
-  }
   > .list-group {
     margin-bottom: 0;
 
