Silarn/TinkerTrap — pull request #8 by Silarn (2013-03-11 22:54:54+00:00)
Title: Working copy for the mergings of insanity

I need to combine my changes with these changes .. and not go crazy!