jgfouca/sub_repo — pull request #2 by jgfouca (2014-09-22 21:32:24+00:00)
Title: conflicting commit from ACME

test pull request