From: Mark Otto <otto@github.com>
Date: Mon, 6 Jan 2014 07:19:34 +0000 (-0800)
Subject: Merge branch 'master' into docs_derp
X-Git-Tag: v3.1.0~121
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e54be9ae61aa95dae7aa5719f38d6dc0216c7b1;p=thirdparty%2Fbootstrap.git

Merge branch 'master' into docs_derp

Conflicts:
	docs/components.html
---

3e54be9ae61aa95dae7aa5719f38d6dc0216c7b1
diff --cc docs/components.html
index 503b612f64,ad7eb079cc..b81b749373
--- a/docs/components.html
+++ b/docs/components.html
@@@ -14,8 -14,7 +14,7 @@@ lead: "Over a dozen reusable component
      </div>
  
      <h2 id="glyphicons-glyphs">Available glyphs</h2>
-     <p>Includes 200 glyphs in font format from the Glyphicon Halflings set. <a href="http://glyphicons.com/">Glyphicons</a> Halflings are normally not available for free, but their creator has made them available for Bootstrap free of cost. As a thank you, we only ask that you to include a link back to <a href="http://glyphicons.com/">Glyphicons</a> whenever possible.</p>
- 
 -    <p>Includes 200 glyphs in font format from the Glyphicon Halflings set. <a href="http://glyphicons.com/">Glyphicons</a> Halflings are normally not available for free, but their creator has made them available for Bootstrap free of cost. As a thank you, we only ask you include a link back to <a href="http://glyphicons.com/">Glyphicons</a> whenever possible.</p>
++    <p>Includes 200 glyphs in font format from the Glyphicon Halflings set. <a href="http://glyphicons.com/">Glyphicons</a> Halflings are normally not available for free, but their creator has made them available for Bootstrap free of cost. As a thank you, we only ask that you include a link back to <a href="http://glyphicons.com/">Glyphicons</a> whenever possible.</p>
      <div class="bs-glyphicons">
        <ul class="bs-glyphicons-list">
          {% for iconClassName in site.data.glyphicons %}