iimarckus/pokered — pull request #55 by dannye (2014-09-24 16:38:24+00:00)
Title: Remove generated .orig files

unnecessary files generated from resolving merge conflicts