Spp 03505a3a42 Merge branch 'master' into 4.3.4 ...

Conflicts:
	src/server/game/Entities/Player/Player.h
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/World/World.cpp
	src/server/game/World/World.h
	src/server/scripts/Commands/cs_reload.cpp

2013-02-27 04:08:19 +01:00

..

base

Merge branch 'master' into 4.3.4

2013-02-27 04:08:19 +01:00

create

…

old

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

2013-02-18 18:51:52 +01:00

updates

Core/RBAC: Add .reload rbac command and prevent possible crash if rbac_permissions has wrong data

2013-02-27 03:30:53 +01:00