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

Conflicts:
	src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/Northrend/IcecrownCitadel/boss_lord_marrowgar.cpp

2013-02-03 01:50:51 +01:00

..

auth

Core/Authserver: Added possibility to allow realm connections both from "world" and local networks.

2013-01-27 17:33:01 +01:00

characters

Core/Titles: There are now 4 title fields (only 2 titles for now, Ruthless and Cataclysmic Gladiator).

2013-01-30 07:05:19 +02:00

world

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

2013-02-03 01:50:51 +01:00