Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Tue, 6 Mar 2012 22:53:02 +0000 (14:53 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 6 Mar 2012 22:53:02 +0000 (14:53 -0800)
By Thomas Rast
* maint:
  t5704: fix nonportable sed/grep usages
  Document the --histogram diff option


Trivial merge