Merge branch 'maint-1.6.1' into maint
commita51609a1c1bdbcf87715d5bae08444d7185d49db
authorJunio C Hamano <gitster@pobox.com>
Sat, 18 Apr 2009 21:43:39 +0000 (18 14:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 18 Apr 2009 21:43:39 +0000 (18 14:43 -0700)
tree3f0ec5559df41d2d22c86d0aba1415b6f7cb1a44
parent08e7239c36a477c52ac83488537600a494002b31
parenta4d1797332bca95635168032c90765a41eacdc7a
Merge branch 'maint-1.6.1' into maint

* maint-1.6.1: