Webcraft-Myplanet/wow-skeletor — pull request #114 by ter3sa (2014-03-02 17:57:33+00:00)
Title: remove conflict lines in the merging of UF-115

Sorry, thought I had removed the conflict lines.