Merge

--HG--
branch : trunk

src/server/game/Spells/Spell.cpp

@@ -6681,6 +6681,7 @@ SpellEvent::~SpellEvent()
     {
         sLog.outError("~SpellEvent: %s %u tried to delete non-deletable spell %u. Was not deleted, causes memory leak.",
             (m_Spell->GetCaster()->GetTypeId() == TYPEID_PLAYER ? "Player" : "Creature"), m_Spell->GetCaster()->GetGUIDLow(), m_Spell->m_spellInfo->Id);
+        ASSERT(false);
     }
 }