TeamMentor/Dev — pull request #22 by kofisarfo (2013-04-26 14:14:05+00:00)
Title: Issue 363

@DinisCruz This is better. Still issues with the occassional entire file being overwritten. Is this something you can handle easily during merge?

And hoping for feedback before making further changes.