From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 29 Apr 2009 22:40:33 +0000 (-0700)
Subject: Merge branch 'maint-1.6.1' into maint
X-Git-Tag: v1.6.3-rc4~6^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a2dc04ba159def766ee17db00c60bdbda477955d;p=git.git

Merge branch 'maint-1.6.1' into maint

* maint-1.6.1:
  diff -c -p: do not die on submodules
---

a2dc04ba159def766ee17db00c60bdbda477955d