TrinityCore/TrinityCore — pull request #7543 by gigatotem (2012-08-27 22:17:19+00:00)
Title: Spells/Shaman: Heroism and Bloodlust

Heroism and Bloodlust will now check for Temporal Displacement from Time Warp and Insanity from Ancient Hysteria.

Finally worked out how to work with branches, thanks for the tips Nay.