*Merge.

--HG--
branch : trunk

src/trinitycore/trinitycore.conf.dist

@@ -502,21 +502,6 @@ LogColors = ""
 #        Default: 0 (false)
 #                 1 (true)
 #
-#    FlyingMounts.Azeroth
-#        Enable/disable flying mounts in Azeroth (map 0 and 1).
-#        Default: 0 - off
-#                 1 - on (may be crashy)
-#
-#    FlyingMounts.Outland
-#        Enable/disable flying mounts in Outland (map 530).
-#        Default: 1 - on
-#                 0 - off
-#
-#    FlyingMounts.Others
-#        Enable/disable flying mounts in other maps (instances, arenas, BGs, etc).
-#        Default: 0 - off
-#                 1 - on (may be crashy)
-#
 #    CastUnstuck
 #        Allow cast or not Unstuck spell at .start or client Help option use
 #        Default: 1 (true)
@@ -622,9 +607,6 @@ ActivateWeather = 1
 Battleground.CastDeserter = 1
 Battleground.QueueAnnouncer.Enable = 1
 Battleground.QueueAnnouncer.PlayerOnly = 0
-FlyingMounts.Azeroth = 0
-FlyingMounts.Outland = 1
-FlyingMounts.Others = 0
 CastUnstuck = 1
 Instance.IgnoreLevel = 0
 Instance.IgnoreRaid = 0