engineyard/engineyard-serverside — pull request #94 by martinemde (2014-04-07 18:09:26+00:00)
Title: A deleted file was recreated in a merge conflict at some point

This file is the same as source.rb