Nay 984e1feadf Merge remote-tracking branch 'origin/master' into 4.3.4 ...

Conflicts:
	src/server/game/Server/WorldSocket.cpp

2013-02-09 20:33:30 +00:00

..

auth

Core/Auth: Reverted part of fb43a92cc2 - session key is still needed after logging in to be able to switch realms

2013-02-08 01:03:56 +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 remote-tracking branch 'origin/master' into 4.3.4

2013-02-09 20:33:30 +00:00