From: Mark Otto <markdotto@gmail.com>
Date: Wed, 25 Jan 2012 00:09:32 +0000 (-0800)
Subject: Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
X-Git-Tag: v2.0.0~6^2~227
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7e6797880a969de8b3d44be91dbc765b6ab48612;p=thirdparty%2Fbootstrap.git

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

Conflicts:
	docs/index.html
	docs/templates/pages/index.mustache
---

7e6797880a969de8b3d44be91dbc765b6ab48612
diff --cc docs/index.html
index 1e4b4a270b,01dae8e6dc..2bbcaa78aa
--- a/docs/index.html
+++ b/docs/index.html
@@@ -99,12 -99,12 +99,6 @@@
            <li>
              <iframe class="github-btn" src="http://markdotto.github.com/github-buttons/github-btn.html?user=twitter&repo=bootstrap&type=fork&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="98px" height="20px"></iframe>
            </li>
--<!--
--          <li><strong>Authors</strong></li>
--          <li><a href="http://twitter.com/mdo">@mdo</a></li>
--          <li><a href="http://twitter.com/fat">@fat</a></li>
-- -->
--
            <li class="divider">&middot;</li>
            <li class="follow-btn">
              <a href="https://twitter.com/twbootstrap" class="twitter-follow-button" data-width="145px" data-link-color="#0069D6" data-show-count="false">Follow @twbootstrap</a>
diff --cc docs/templates/pages/index.mustache
index 899d721b0e,dbe30443e5..82307eec70
--- a/docs/templates/pages/index.mustache
+++ b/docs/templates/pages/index.mustache
@@@ -39,15 -39,15 +39,9 @@@
            <li>
              <iframe class="github-btn" src="http://markdotto.github.com/github-buttons/github-btn.html?user=twitter&repo=bootstrap&type=fork&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="98px" height="20px"></iframe>
            </li>
--<!--
-           <li><strong>Authors</strong></li>
 -          <li><strong>{{_i}}Authors{{/i}}</strong></li>
--          <li><a href="http://twitter.com/mdo">@mdo</a></li>
--          <li><a href="http://twitter.com/fat">@fat</a></li>
-- -->
--
            <li class="divider">&middot;</li>
            <li class="follow-btn">
-             <a href="https://twitter.com/twbootstrap" class="twitter-follow-button" data-width="145px" data-link-color="#0069D6" data-show-count="false">Follow @twbootstrap</a>
+             <a href="https://twitter.com/twbootstrap" class="twitter-follow-button" data-width="145px" data-link-color="#0069D6" data-show-count="false">{{_i}}Follow @twbootstrap{{/i}}</a>
            </li>
            <li class="tweet-btn">
              <a href="https://twitter.com/share" class="twitter-share-button" data-url="http://twitter.github.com/bootstrap/" data-count="horizontal" data-via="twbootstrap" data-related="mdo:Creator of Twitter Bootstrap">Tweet</a>