![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 3 May 2009 23:14:07 +0000 (16:14 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 3 May 2009 23:14:07 +0000 (16:14 -0700) | ||
| commit | 00f97c72f22b82c6c77ae429986060832c6b6f55 | |
| tree | eb28f42d27c94d3318d9c98fb5eae014b3de553a | tree | snapshot |
| parent | d265ddce1fe3860f67bfe5491dd75b0e657d9062 | commit | diff |
| parent | bab39ed371145b83340750101e7ec85167845857 | commit | diff |
Merge branch 'maint-1.6.1' into maint
* maint-1.6.1:
GIT 1.6.1.4
Conflicts:
GIT-VERSION-GEN
* maint-1.6.1:
GIT 1.6.1.4
Conflicts:
GIT-VERSION-GEN