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

Junio C Hamano committed Jan 18, 2012 at 15:48 UTC d899cf559b6a93006993752e7a89d13606380227

No changes.