Merge branch 'tab-event' of https://github.com/kasperp/bootstrap into kasperp-tab...

diff --cc docs/javascript.html
Simple merge

diff --cc js/bootstrap-tabs.js
index dece95be66aa0b6f3d0d933cfe2e26e164debd0b,380ded17c8494b9832f86dedb93e5ba0d7b92ed4..563d88f0130ce29b665d86cd788e95eb7e9f5bde
--- 1/js/bootstrap-tabs.js
--- 2/js/bootstrap-tabs.js
+++ b/js/bootstrap-tabs.js
@@@ -28,8 -28,9 +28,9 @@@
    function tab( e ) {
      var $this = $(this)
        , href = $this.attr('href')
 -      , $ul = $(e.liveFired)
 +      , $ul = $this.closest('ul')
        , $controlled
+       , current = $ul.find('.active a').attr('href')
  
      if (/^#\w+/.test(href)) {
        e.preventDefault()
@@@ -59,4 -61,4 +61,4 @@@
      $('body').tabs('ul[data-tabs] li > a, ul[data-pills] > li > a')
    })
  
- }( window.jQuery || window.ender );
 -})( window.jQuery || window.ender )
++}( window.jQuery || window.ender );