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

Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/scripts/Spells/spell_paladin.cpp

2014-06-05 19:42:48 +02:00

..

auth

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

2014-04-28 23:00:41 +02:00

characters

DB/Seasonal:

2014-04-30 01:40:53 +02:00

world

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

2014-06-05 19:42:48 +02:00