Merge branch 'maint'
commit7de265a4cfd2c6dbe1c7af8c592a23ede08ec854
authorJunio C Hamano <gitster@pobox.com>
Sat, 7 Feb 2009 18:44:25 +0000 (7 10:44 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 7 Feb 2009 18:44:25 +0000 (7 10:44 -0800)
tree5309427690a1b1655e2c718b24ec673596a51a00
parent7851386948dce72c739bcdfe08f069afe4f5ea45
parentb59122f86f23007fce374f92de7f6e0a73793026
Merge branch 'maint'

* maint:
  GIT 1.6.1.3

Conflicts:
GIT-VERSION-GEN
RelNotes