Sync with Git 2.1.1
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2014 21:22:34 +0000 (14:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2014 21:22:43 +0000 (14:22 -0700)
Trivial merge