From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 3 Jun 2013 20:00:03 +0000 (-0700)
Subject: Sync with maint
X-Git-Tag: v1.8.4-rc0~221
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b5c26758639cd934780620d4dd16854c8fdf8c34?ds=inline;hp=--cc

Sync with maint
---

b5c26758639cd934780620d4dd16854c8fdf8c34