mjibson/goread — pull request #118 by fajran (2013-07-04 21:28:51+00:00)
Title: If a folder is renamed to an existing name, merge them

This fixes #117