Merge branch 'maint-1.6.1' into maint-1.6.2
commit58e93fa357006d9a231da48fb81eb23c417ed927
authorJunio C Hamano <gitster@pobox.com>
Sat, 9 May 2009 04:13:47 +0000 (8 21:13 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 9 May 2009 04:13:47 +0000 (8 21:13 -0700)
tree37c1a5b79998b3bc70a0bb70874abaa062181090
parent54e0e6edfa60f84b582112804365e207e70f44a6
parentf29d669a91b2c8f1c68c1f4fb10f03456a997fa8
Merge branch 'maint-1.6.1' into maint-1.6.2

* maint-1.6.1: