*Merge

--HG--
branch : trunk

src/game/SpellAuras.cpp

@@ -915,11 +915,6 @@ void Aura::_AddAura()
 
 void Aura::_RemoveAura()
 {
-    // Remove all triggered by aura spells vs unlimited duration
-    // except same aura replace case
-    if(m_removeMode!=AURA_REMOVE_BY_STACK)
-        CleanupTriggeredSpells();
-
     Unit* caster = GetCaster();
 
     if(caster && IsPersistent())