From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 3 May 2009 23:14:07 +0000 (-0700)
Subject: Merge branch 'maint-1.6.1' into maint
X-Git-Tag: v1.6.2.5~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/00f97c72f22b82c6c77ae429986060832c6b6f55?ds=inline;hp=--cc

Merge branch 'maint-1.6.1' into maint

* maint-1.6.1:
GIT 1.6.1.4

Conflicts:
GIT-VERSION-GEN
---

00f97c72f22b82c6c77ae429986060832c6b6f55