Merge branch 'tr/void-diff-setup-done' into maint-1.7.11

* tr/void-diff-setup-done: diff_setup_done(): return void

Junio C Hamano committed Sep 11, 2012 at 10:53 UTC 738c2187604756fea3901554a49f9137e02ed0ef

No changes.