Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4

Conflicts: src/server/game/Spells/SpellMgr.cpp
2014-10-18 16:00:20 +02:00
parent c238e8faff 8308f4a234
commit 4a0be2bffc
1 changed files with 1 additions and 1 deletions
@@ -3338,7 +3338,7 @@ void SpellMgr::LoadSpellInfoCorrections()
                break;
            case 51798: // Brewfest - Relay Race - Intro - Quest Complete
            case 47134: // Quest Complete
-                //! HACK: This spell break quest complete for alliance and on retail not used °_O
+                //! HACK: This spell break quest complete for alliance and on retail not used °_O
                spellInfo->Effects[EFFECT_0].Effect = 0;
                break;
            // ULDUAR SPELLS