Merge branch 'maint-1.6.1' into maint
* maint-1.6.1: GIT 1.6.1.4 Conflicts: GIT-VERSION-GEN
Junio C Hamano committed
May 3, 2009 at 16:14 UTC
00f97c72f22b82c6c77ae429986060832c6b6f55
No changes.
* maint-1.6.1: GIT 1.6.1.4 Conflicts: GIT-VERSION-GEN
No changes.