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

Conflicts:
	src/server/shared/Database/Implementation/CharacterDatabase.cpp

2013-06-03 18:19:18 +02:00

..

auth_database.sql

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

2013-06-03 18:19:18 +02:00

characters_database.sql

Merge branch 'master' into 4.3.4 [NOTE: There are parts of code marked as "REVIEW - MERGE" That needs some review)

2013-05-21 09:41:13 +02:00