Merge branch 'maint'
commit252f922b1919db3bcfdc07bbedff7d3c42172959
authorJunio C Hamano <gitster@pobox.com>
Tue, 18 Dec 2012 23:35:01 +0000 (18 15:35 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 18 Dec 2012 23:35:01 +0000 (18 15:35 -0800)
treeb85686e7a601ddffbe9f43a6b824dadaf77220bc
parentb7cd0c9b692af7728a1d876a3e4fe760956e00c3
parent086cb911533d6f4233e84c93b08da289ecc8a229
Merge branch 'maint'

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