Merge branch 'maint-1.7.8' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 6 Mar 2012 20:05:09 +0000 (12:05 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 6 Mar 2012 20:05:09 +0000 (12:05 -0800)
By Thomas Rast
* maint-1.7.8:
  Document the --histogram diff option


Trivial merge