Andrew's git / gitweb.git / diff
?
Merge branch 'maint-1.6.1' into maint
authorJunio C Hamano <gitster@pobox.com>
Sun, 3 May 2009 23:14:07 +0000 (16:14 -0700)
committerJunio 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

Trivial merge