From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 Jan 2012 23:52:08 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.9-rc2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6e06367ab0586189940a7f08c394d13fce14e87f;p=git.git

Merge branch 'maint'

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

Conflicts:
	GIT-VERSION-GEN
---

6e06367ab0586189940a7f08c394d13fce14e87f