ZomgPonies/Paradise — pull request #477 by Fox-McCloud (2014-11-08 05:48:41+00:00)
Title: Revert "Merge Conflict Resolution?"

Reverts ZomgPonies/Paradise#476