From: Mark Otto <markdotto@gmail.com>
Date: Sun, 5 Feb 2012 09:26:44 +0000 (-0800)
Subject: Merge branch 'noahblon-master' into 2.0.1-wip
X-Git-Tag: v2.0.1~1^2~52
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9b5b8460b4e6d5e30357aaddbef5425a6150b0bf;p=thirdparty%2Fbootstrap.git

Merge branch 'noahblon-master' into 2.0.1-wip

Conflicts:
	docs/assets/bootstrap.zip
---

9b5b8460b4e6d5e30357aaddbef5425a6150b0bf
diff --cc docs/assets/bootstrap.zip
index 32afa3a022,57c5130347..91279e1ac2
Binary files differ
diff --cc docs/download.html
index 8442dcad1e,1765b8a7d1..c385046dd4
--- a/docs/download.html
+++ b/docs/download.html
@@@ -93,7 -93,7 +93,7 @@@
    <div class="page-header">
      <a class="btn btn-small pull-right toggle-all" href="#">Toggle all</a>
      <h1>
--      1. Chose components
++      1. Choose components
        <small>Get just the CSS you need</small>
      </h1>
    </div>