CiBeR96/TrinityCore — pull request #2 by CiBeR96 (2014-11-01 00:28:34+00:00)
Title: merge

Merge 31/10/2014