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)
commit556c5e030f17efb412a192a430fe9027840ed718
tree1600c629829c2b1f029af13da527c3380b25c5e7
parent85551232b56e763ecfcc7222e0858bac4e962c80
parent0dbe6592ccbd1a394a69a52074e3729d546fe952
Merge branch 'maint'

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