Carbenium 7d5d040948 Merge commit 'b69fd4ac682347b8b735ac7116ada25d79698933' into 4.3.4 ...

Conflicts:
	README.md
	sql/updates/world/2015_02_06_13_world_335.sql
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Spells/SpellMgr.cpp

2015-07-21 21:45:04 +02:00

..

Group.cpp

Merge commit 'b69fd4ac682347b8b735ac7116ada25d79698933' into 4.3.4

2015-07-21 21:45:04 +02:00

Group.h

Update (C) date

2015-07-19 13:37:44 +02:00

GroupMgr.cpp

Update (C) date

2015-07-19 13:37:44 +02:00

GroupMgr.h

Update (C) date

2015-07-19 13:37:44 +02:00

GroupReference.cpp

Update (C) date

2015-07-19 13:37:44 +02:00

GroupReference.h

Update (C) date

2015-07-19 13:37:44 +02:00

GroupRefManager.h

Update (C) date

2015-07-19 13:37:44 +02:00