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

Conflicts:
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Spells/SpellInfo.h
	src/server/game/World/World.cpp

2013-12-15 03:47:21 +01:00

..

auth

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

2013-12-08 20:27:46 +01:00

characters

SQL: Rename in correct name

2013-07-19 14:01:25 +02:00

world

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

2013-12-15 03:47:21 +01:00