borkweb/repo-to-subtree — pull request #1 by borkweb (2013-02-21 20:54:58+00:00)
Title: Fixing conflict

Conflicts:
a-sweet-file.txt