tree 267c22ffce9a9d705f48749d650ce2b62b690aa8
parent ab8a78084b7159d99dae2905e1a3ff04c1500a6d
parent 00653435488f5ed86c5d6dc411fa14fa56f5e3bc
author Junio C Hamano <gitster@pobox.com> 1326930526 -0800
committer Junio C Hamano <gitster@pobox.com> 1326930526 -0800

Merge branch 'maint-1.7.7' into maint

* maint-1.7.7:
  Git 1.7.7.6
  diff-index: enable recursive pathspec matching in unpack_trees

Conflicts:
	GIT-VERSION-GEN