tree b9b4fc57306b099098838c4889e49540f03bf9ae
parent 99f55ebc6757ec8777627142e7f8e1dc50f68d2c
parent 9904fadfea002edf2ef22e8ec9a978e45d1f540b
author Junio C Hamano <gitster@pobox.com> 1284136748 -0700
committer Junio C Hamano <gitster@pobox.com> 1284136748 -0700

Merge branch 'maint'

* maint:
  config.txt: fix placement of diff.noprefix