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

Junio C Hamano committed Jan 18, 2012 at 15:52 UTC 6e06367ab0586189940a7f08c394d13fce14e87f

No changes.