Merge branch 'maint-1.7.8' into maint

By Thomas Rast * maint-1.7.8: Document the --histogram diff option

Junio C Hamano committed Mar 6, 2012 at 12:05 UTC 80a3f53424b2e3d6d7b9463dbd3faa888ced947f

No changes.