Vincent_Michael 7f2a1ece62 Fix merge fail (fucking saving button -.-)

2013-02-04 22:17:23 +01:00

..

auth_database.sql

Fix merge fail (fucking saving button -.-)

2013-02-04 22:17:23 +01:00

characters_database.sql

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

2013-02-04 22:14:56 +01:00