Merge branch 'maint'
commita54c4edc511608fdba513cc94812c31fd4b497f6
authorJunio C Hamano <gitster@pobox.com>
Sun, 12 Apr 2009 23:01:25 +0000 (12 16:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 12 Apr 2009 23:01:25 +0000 (12 16:01 -0700)
tree53dea1be73208c23be4cdf2aec37894de8415889
parentee7ec2f9ded03700f2b95cc1d4b3d60ed374132a
parent3bd1bb327eb4d3e386800897734f9f42b48280ff
Merge branch 'maint'

* maint:
  GIT 1.6.2.3
  State the effect of filter-branch on graft explicitly
  process_{tree,blob}: Remove useless xstrdup calls

Conflicts:
GIT-VERSION-GEN
Documentation/git-filter-branch.txt
builtin-pack-objects.c