Merge branch 'jk/long-paths' into maint-2.2
authorJunio C Hamano <gitster@pobox.com>
Fri, 4 Sep 2015 17:25:23 +0000 (10:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 4 Sep 2015 17:25:23 +0000 (10:25 -0700)

Trivial merge