Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Dec 2014 20:43:48 +0000 (12:43 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Dec 2014 20:43:48 +0000 (12:43 -0800)
commitbbcefffcea9789e4a1a2023a1c778e2c07db77a7
tree2279bf3227349f68c370e80ce99cf1a8caafda80
parent2c380e7a8da9bd9a4e40221e36cb68f756d49829
parentc2e8e4b9da4d007b15faa2e3d407b2fd279f0572
Sync with maint

Signed-off-by: Junio C Hamano <gitster@pobox.com>