Merge branch 'maint'

By Thomas Rast * maint: t5704: fix nonportable sed/grep usages Document the --histogram diff option

Junio C Hamano committed Mar 6, 2012 at 14:53 UTC 556c5e030f17efb412a192a430fe9027840ed718

No changes.