Merge branch 'maint-1.6.1' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 29 Apr 2009 22:40:33 +0000 (15:40 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 Apr 2009 22:40:33 +0000 (15:40 -0700)
* maint-1.6.1:
  diff -c -p: do not die on submodules


Trivial merge