Spp b9b57c2d62 Merge branch 'master' into 4.3.4 ...

Conflicts:
	src/server/game/Chat/ChatLink.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/ChannelHandler.cpp
	src/server/scripts/EasternKingdoms/hinterlands.cpp

2012-11-22 15:04:59 +01:00

..

characters

Core/Currency: Add support of Conquest points cap for arena and bg

2012-11-21 18:25:23 +01:00

world

Merge branch 'master' into 4.3.4

2012-11-22 15:04:59 +01:00