Merge branch 'maint'
commit7c851733e4bc2b36bd9df63cab2fe11180242670
authorJunio C Hamano <gitster@pobox.com>
Fri, 29 Jun 2007 05:05:30 +0000 (28 22:05 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 29 Jun 2007 05:05:30 +0000 (28 22:05 -0700)
treeca00d88288a844075b41a05b5aa344fecfdd7566
parent82ff9d2c8b0d449fbaae21a69bcc3b98a4012180
parentb8336519450fdedc8f9cafebc73f7a0226e34e1f
Merge branch 'maint'

* maint: