From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 18 Dec 2012 23:35:01 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.8.1-rc3~13
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/252f922b1919db3bcfdc07bbedff7d3c42172959?ds=inline;hp=--cc

Merge branch 'maint'

* maint:
t7004: do not create unneeded gpghome/gpg.conf when GPG is not used
---

252f922b1919db3bcfdc07bbedff7d3c42172959