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

Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
This commit is contained in:
Vincent-Michael
2014-06-17 21:22:45 +02:00
7 changed files with 54 additions and 30 deletions

View File

@@ -0,0 +1,3 @@
DELETE FROM spell_group WHERE id=1059 AND spell_id=58180;
DELETE FROM spell_group WHERE id=1059 AND spell_id=58181;