Commit 473a7a1e70d05ec125309304d56f060c3e3ad40e

Philip Kelley 2012-11-02T08:43:17

Merge pull request #1040 from ethomson/index_refactor Free conflict index entries on removal