Commit 1d5220dcd16963ba592f135bd8a68e310500f11b

Vicent Martí 2013-03-29T10:13:54

Merge pull request #1445 from ethomson/reset_unmerged remove unmerged files during reset hard