Vincent-Michael d4ac53083f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 ...

Conflicts:
	src/server/game/Entities/Corpse/Corpse.cpp
	src/server/game/Globals/ObjectMgr.cpp

2013-07-19 22:33:35 +02: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-07-19 22:33:35 +02:00