Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Sat, 25 Jul 2009 08:31:53 +0000 (01:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 25 Jul 2009 08:31:53 +0000 (01:31 -0700)
commit8f5e3ca7d1d9c987c5a50934f1acdbad44163f3b
treec1093f41bebfaa211a072faf887d7d283f493ae3
parentb3601a633801861da9dc1e6b4f7d62b05ca1706c
parent422a82f21370fe38b3e926a83b460bf2b1dd13ab
Merge branch 'maint'

* maint:
  Fix severe breakage in "git-apply --whitespace=fix"