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

2 files changed, 1 insertions, 1 deletions

diff --git a/Gruntfile.js b/Gruntfile.js
index dd0cc9600..7aad9b339 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -28,7 +28,6 @@ module.exports = function(grunt) {
         },
         jshint: {
             options: {
-                ignores: [],// HACK: workaround https://github.com/gruntjs/grunt-contrib-jshint/issues/86
                 jshintrc: 'js/.jshintrc'
             },
             gruntfile: {
diff --git a/css.html b/css.html
index e9fc41156..e6d17d185 100644
--- a/css.html
+++ b/css.html
@@ -1792,6 +1792,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
     <div class="bs-callout bs-callout-warning">
       <h4>Cross-browser rendering</h4>
       <p>As a best practice, <strong>we highly recommend using the <code>&lt;button&gt;</code> element whenever possible</strong> to ensure matching cross-browser rendering.</p>
+      <p>Among other things, there's <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=697451">a Firefox bug</a> that prevents us from setting the <code>line-height</code> of <code>&lt;input&gt;</code>-based buttons, causing them to not exactly match the height of other buttons on Firefox.</p>
     </div>
 
   </div>