Commit 54a1a042910968441c668f3302f724e733354746

Edward Thomson 2013-03-29T11:26:12

remove unmerged files during reset hard