Yehonal a99323aa1b Merge branch 'master' of git@github.com:azerothcore/azerothcore-wotlk.git ...

# Conflicts:
#	src/server/worldserver/worldserver.conf.dist

2016-08-08 12:28:38 +02:00

..

azerothshard

multiple changes to sync with public repository

2016-08-08 12:14:04 +02:00

dep

Merge branch 'master' into git

2016-08-07 14:55:21 +02:00