Merge branch 'tooltip-events-fix' of git://github.com/lukaszfiszer/bootstrap into...

Conflicts:
	js/tooltip.js

diff --cc js/tooltip.js
index 9d1e8421bf37fc06e1c696911a70b2215bcdf8be,533f19b3157ceeabc34a8bebfbc61bf4ebf3db90..4c0e4bdcdf1bfa4c7bf5a01bc9d9f67fd133ab9f
--- 1/js/tooltip.js
--- 2/js/tooltip.js
+++ b/js/tooltip.js
@@@ -177,8 -189,17 +178,17 @@@
        var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight)
  
        this.applyPlacement(calculatedOffset, placement)
-       this.$element.trigger('shown.bs.' + this.type)
 +      this.hoverState = null
 -      $tip
 -        .one($.support.transition.end, complete)
 -        .emulateTransitionEnd(150) :
 -      complete()
 -
+ 
+       var complete = function() {
+         that.$element.trigger('shown.bs.' + that.type)
+       }
+ 
+       $.support.transition && this.$tip.hasClass('fade') ?
++        $tip
++          .one($.support.transition.end, complete)
++          .emulateTransitionEnd(150) :
++        complete()
      }
    }
  
@@@ -275,9 -288,6 +286,8 @@@
          .emulateTransitionEnd(150) :
        complete()
  
-     this.$element.trigger('hidden.bs.' + this.type)
 +    this.hoverState = null
 +
      return this
    }