Merge commit '1a075f0454fcfc1fb23432e6853af4a36730de98' into 4.3.4

Conflicts:
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Server/WorldSession.h
This commit is contained in:
Carbenium committed 2015-07-21 18:04:43 +02:00
commit 38027226ff
10 files changed
+426 -421

No files matched your search

File diff suppressed because it is too large. Load diff