DDuarte 1f6066c6e3 Merge remote-tracking branch 'origin/master' into 4.3.4 ...

Conflicts:
	src/server/game/Entities/Player/Player.cpp

2014-09-06 22:03:20 +01:00

..

auth

Scripts/Commands: Implement .guild info command

2014-08-28 23:04:52 +01:00

characters

Core/BattleGrounds: store data about BGs victories

2014-08-28 15:32:38 +01:00

world

Merge remote-tracking branch 'origin/master' into 4.3.4

2014-09-06 22:03:20 +01:00