Merge branch 'sb/unpack-trees-grammofix' into maint

* sb/unpack-trees-grammofix: unpack-trees: fix grammar for untracked files in directories

Junio C Hamano committed Jan 17, 2017 at 15:19 UTC 1addc197eb41a8fbcd6968c4ee245b65a68c2be6

No changes.