Merge branch 'maint'
commita1ad2475a710a90e28f41c5110f59e2cf7282b70
authorJunio C Hamano <gitster@pobox.com>
Thu, 6 Nov 2014 18:52:51 +0000 (6 10:52 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 6 Nov 2014 18:52:51 +0000 (6 10:52 -0800)
tree15bed29be9a6e466a1cafe4d53819909581e5605
parent32da67bf222d93289bea304c92c4d2329aa17857
parente50cd67ba477133458158a016ffabb8e4bfc81bf
Merge branch 'maint'

* maint:
  docs/credential-store: s/--store/--file/