Yehonal 921861c19f Merge branch 'master' into custom ...

# Conflicts:
#	modules/acore/framework/Database/Implementation/CharacterDatabase.cpp
#	src/game/Groups/GroupMgr.cpp

2016-08-13 20:41:35 +02:00

..

acore

Merge branch 'master' into custom

2016-08-13 20:41:35 +02:00

azerothshard

[AZTH] default conf for extra db

2016-08-13 20:26:17 +02:00

hw-core

created hw-core bash libraries

2016-08-13 20:32:21 +02:00

uwd

minor updates to mysql-tools

2016-08-13 20:32:17 +02:00