Merge branch 'master' into docs_derp

Conflicts:
	_layouts/default.html
	components.html

diff --cc _includes/footer.html
index fcea91b1467ec85b15f863637a8990417a61a223,095e96eb5928b1acff2be10c22eb2e04a2604874..d9c8e205247706f9c7f272a9249dba6dcddd0da9
--- 1/_includes/footer.html
--- 2/_includes/footer.html
+++ b/_includes/footer.html
@@@ -1,27 -1,3 +1,28 @@@
 +<!-- Footer
 +================================================== -->
 +<footer class="bs-footer" role="contentinfo">
 +  <div class="container">
 +    {% include social-buttons.html %}
 +
 +    <p>Designed and built with all the love in the world by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
++    <p>Maintained by the <a href="https://github.com/twbs?tab=members">core team</a> with the help of <a href="https://github.com/twbs/bootstrap/graphs/contributors">our contributors</a>.</p>
 +    <p>Code licensed under <a href="https://github.com/twbs/bootstrap/blob/master/LICENSE" target="_blank">MIT</a>, documentation under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
 +    <ul class="footer-links muted">
 +      <li>Currently v{{ site.current_version }}</li>
 +      <li>&middot;</li>
 +      <li><a href="{{ page.base_url }}2.3.2/">v2.3.2 docs</a></li>
 +      <li>&middot;</li>
 +      <li><a href="{{ page.base_url }}about/">About</a></li>
 +      <li>&middot;</li>
 +      <li><a href="{{ site.blog }}">Blog</a></li>
 +      <li>&middot;</li>
 +      <li><a href="{{ site.repo }}/issues?state=open">Issues</a></li>
 +      <li>&middot;</li>
 +      <li><a href="{{ site.repo }}/releases">Releases</a></li>
 +    </ul>
 +  </div>
 +</footer>
 +
  <!-- Bootstrap core JavaScript
  ================================================== -->
  <!-- Placed at the end of the document so the pages load faster -->

diff --cc components.html
index 660debeeca7b749b4b7dbe232463f8a34589be07,b511f46a0171804dc4c276593e27a6fde40832d2..f93092c9cdd41a9bf569d76cf91eea0b4b9bbfd6
--- 1/components.html
--- 2/components.html
+++ b/components.html
@@@ -16,8 -16,16 +16,17 @@@ base_url: "../
  
      <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>
-     {% include glyphicons.html %}
 +
+     <div class="bs-glyphicons">
+       <ul class="bs-glyphicons-list">
+         {% for iconClassName in site.data.glyphicons %}
+           <li>
+             <span class="glyphicon {{ iconClassName }}"></span>
+             <span class="glyphicon-class">glyphicon {{ iconClassName }}</span>
+           </li>
+         {% endfor %}
+       </ul>
+     </div>
  
  
      <h2 id="glyphicons-how-to-use">How to use</h2>

diff --cc css.html
Simple merge