![[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) |
* maint-1.6.1:
GIT 1.6.1.4
Conflicts:
GIT-VERSION-GEN
GIT 1.6.1.4
Conflicts:
GIT-VERSION-GEN
Trivial merge