From: Mark Otto <markotto@twitter.com>
Date: Mon, 27 Feb 2012 07:16:11 +0000 (-0800)
Subject: Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip
X-Git-Tag: v2.0.2~98
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1a781a707e0785a1abd079a9c29628b0d8d1867d;p=thirdparty%2Fbootstrap.git

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

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

1a781a707e0785a1abd079a9c29628b0d8d1867d
diff --cc docs/assets/bootstrap.zip
index 7a94384807,a61ae844d8..63f92b76f2
Binary files differ
diff --cc docs/assets/js/bootstrap-tooltip.js
index d76e51e8c9,d76e51e8c9..e7bfd09bf2
--- a/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
      }