Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip

Conflicts:
	docs/assets/bootstrap.zip

diff --cc docs/assets/bootstrap.zip
index 7a94384807a1b88e385be22546471784befcb772,a61ae844d8be54af49c26505ddac5da82ae5c031..63f92b76f2d2a71d016d8ecc03295242a0aabe67
Binary files differ

diff --cc docs/assets/js/bootstrap-tooltip.js
index d76e51e8c9179784591d60893ae3d5bb7b834e1b,d76e51e8c9179784591d60893ae3d5bb7b834e1b..e7bfd09bf2bcae90fd999b0002aa984cd6e06204
--- 1/docs/assets/js/bootstrap-tooltip.js
--- 2/docs/assets/js/bootstrap-tooltip.js
+++ b/docs/assets/js/bootstrap-tooltip.js
@@@ -206,7 -206,7 +206,7 @@@
        title = $e.attr('data-original-title')
          || (typeof o.title == 'function' ? o.title.call($e[0]) :  o.title)
  
--      title = title.toString().replace(/(^\s*|\s*$)/, "")
++      title = (title || '').toString().replace(/(^\s*|\s*$)/, "")
  
        return title
      }

diff --cc docs/javascript.html
Simple merge

diff --cc docs/templates/pages/javascript.mustache
Simple merge