Vincent-Michael c57fa8f781 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 ...

Conflicts:
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/game/Spells/SpellInfo.h
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_priest.cpp
	src/server/scripts/Spells/spell_warlock.cpp

2013-07-26 02:04:32 +02:00

..

base

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

2013-07-19 22:33:35 +02:00

create

…

old

TDB 424.05

2013-07-17 00:56:05 +01:00

updates

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

2013-07-26 02:04:32 +02:00