Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Tue, 18 Dec 2012 23:35:01 +0000 (15:35 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 18 Dec 2012 23:35:01 +0000 (15:35 -0800)
* maint:
t7004: do not create unneeded gpghome/gpg.conf when GPG is not used

Trivial merge