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

Conflicts:
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_paladin.cpp

2013-07-28 18:41:57 +02:00

..

2.4.3

…

3.0.9

…

3.1.3

…

3.2.2a

…

3.3.2

…

3.3.3a

…

3.3.5a

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

2013-07-28 18:41:57 +02:00

4.2.2

…

4.3.4

TDB 424.05

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