Merge branch 'cb/filter-branch-prune-empty-degenerate-merges' into maint

* cb/filter-branch-prune-empty-degenerate-merges: filter-branch: eliminate duplicate mapped parents

Junio C Hamano committed Jul 22, 2014 at 10:28 UTC 5796c5baa3ef0a7d179fdac6cb5815f75f65fd53

No changes.