Merge branch 'maint'

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

Junio C Hamano committed Dec 18, 2012 at 15:35 UTC 252f922b1919db3bcfdc07bbedff7d3c42172959

No changes.