Merge branch 'offcanvas-example' of https://github.com/trumbitta/bootstrap into trumb...

diff --cc docs/_includes/footer.html
index fcfc7c48285f77b111239022783731b3146529d9,81cd6f947cf123e6b8e894922cd8722214f21777..19a9af636207d91adaaa9906481ef979c4aab4e3
--- 1/docs/_includes/footer.html
--- 2/docs/_includes/footer.html
+++ b/docs/_includes/footer.html
@@@ -2,8 -2,24 +2,12 @@@
  ================================================== -->
  <!-- Placed at the end of the document so the pages load faster -->
  <script src="/assets/js/jquery.js"></script>
 -<script src="/assets/js/bootstrap-transition.js"></script>
 -<script src="/assets/js/bootstrap-alert.js"></script>
 -<script src="/assets/js/bootstrap-modal.js"></script>
 -<script src="/assets/js/bootstrap-dropdown.js"></script>
 -<script src="/assets/js/bootstrap-scrollspy.js"></script>
 -<script src="/assets/js/bootstrap-tab.js"></script>
 -<script src="/assets/js/bootstrap-tooltip.js"></script>
 -<script src="/assets/js/bootstrap-popover.js"></script>
 -<script src="/assets/js/bootstrap-button.js"></script>
 -<script src="/assets/js/bootstrap-collapse.js"></script>
 -<script src="/assets/js/bootstrap-carousel.js"></script>
 -<script src="/assets/js/bootstrap-typeahead.js"></script>
 -<script src="/assets/js/bootstrap-affix.js"></script>
 +<script src="/assets/js/bootstrap.js"></script>
  
+ <!-- Offcanvas example
+ ================================================== -->
+ <script src="/assets/js/examples/bootstrap-offcanvas.js"></script>
+ 
  <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
  <script src="/assets/js/holder/holder.js"></script>
  

diff --cc docs/docs.html
Simple merge