From: Jacob Thornton <jacobthornton@gmail.com>
Date: Tue, 24 Jan 2012 22:31:10 +0000 (-0800)
Subject: Merge branch '2.0-wip' of https://github.com/MGaetan89/bootstrap into 2.0-wip
X-Git-Tag: v2.0.0~6^2~227^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fbc1ab14cc7e591f4b2e53ef3fb25ef7dc243fce;p=thirdparty%2Fbootstrap.git

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

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

fbc1ab14cc7e591f4b2e53ef3fb25ef7dc243fce
diff --cc docs/index.html
index d0c0bcae60,1743676b6c..aea901cb5d
--- a/docs/index.html
+++ b/docs/index.html
@@@ -135,8 -135,8 +135,7 @@@
                </a>
              </li>
            </ul>
--
-           <h1Designed for everyone, everywhere.</h1>
+           <h1>Designed for everyone, everywhere.</h1>
            <p class="marketing-byline">Need reasons to love Bootstrap? Look no further.</p>
            <div class="row">
              <div class="span4">
diff --cc docs/templates/pages/index.mustache
index 1e77d4a25a,072ed6da6a..8cf9261236
--- a/docs/templates/pages/index.mustache
+++ b/docs/templates/pages/index.mustache
@@@ -75,8 -75,8 +75,7 @@@
                </a>
              </li>
            </ul>
--
-           <h1{{_i}}Designed for everyone, everywhere.{{/i}}</h1>
+           <h1>{{_i}}Designed for everyone, everywhere.{{/i}}</h1>
            <p class="marketing-byline">{{_i}}Need reasons to love Bootstrap? Look no further.{{/i}}</p>
            <div class="row">
              <div class="span4">