Sync with 'maint'
authorJunio C Hamano <gitster@pobox.com>
Wed, 12 Nov 2014 20:13:25 +0000 (12:13 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 12 Nov 2014 20:13:25 +0000 (12:13 -0800)
Trivial merge