MovingBlocks/Terasology — pull request #164 by KaiKratz (2012-02-27 19:38:35+00:00)
Title: removes more conflict files

removes .orig files