ghidinelli/transfer — pull request #3 by seancoyne (2014-07-24 17:21:55+00:00)
Title: fix some bad merges

turns out I can create pull request.

this should fix those bad merges.