*Merge.

--HG--
branch : trunk

src/game/SpellEffects.cpp

@@ -338,6 +338,14 @@ void Spell::SpellDamageSchoolDmg(uint32 effect_idx)
 
                 switch(m_spellInfo->Id)                     // better way to check unknown
                 {
+                    case 35354://hand of death
+                    {
+                        if(unitTarget && unitTarget->HasAura(38528,0))//protection of elune
+                        {
+                            damage = 0;
+                        }
+                        break;
+                    }
                     // percent from health with min
                     case 25599:                             // Thundercrash
                     {

src/game/SpellMgr.cpp

@@ -499,7 +499,8 @@ bool IsPositiveEffect(uint32 spellId, uint32 effIndex)
         case 37675:                                         // Chaos Blast
         case 41519:                                         // Mark of Stormrage
         case 34877:                                         // Custodian of Time
-        case 34700:
+        case 34700:                                         // Allergic Reaction
+        case 31719:                                         // Suspension
             return false;
     }
 
@@ -2268,7 +2269,7 @@ void SpellMgr::LoadSpellCustomAttr()
         case 41635: // Prayer of Mending
         case 44869: // Spectral Blast
         case 45027: // Revitalize
-        case 45976: // Muru Portal Channel
+        case 45976: // Muru Portal Channel        
             spellInfo->MaxAffectedTargets = 1;
             break;
         case 41376: // Spite
@@ -2300,6 +2301,10 @@ void SpellMgr::LoadSpellCustomAttr()
         case 12494: // Frostbite
             spellInfo->Attributes |= SPELL_ATTR_BREAKABLE_BY_DAMAGE;
             break;
+        case 38794: case 33711: //Murmur's Touch
+            spellInfo->MaxAffectedTargets = 1;
+            spellInfo->EffectTriggerSpell[0] = 33760;
+            break;
         default:
             break;
         }