Sync with master
commit56c219538365476350863092eb214613a85dcc66
authorJunio C Hamano <gitster@pobox.com>
Tue, 15 Jul 2014 20:46:11 +0000 (15 13:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 15 Jul 2014 20:46:11 +0000 (15 13:46 -0700)
tree827d7d26169c3c5a8538cf7810d165f22a8cae80
parentce68dde9a841a86c119ec3d92b63694d4e5656cc
parent3d15f536a7f5215eddae20214fb8eaeeb6baaf27
Sync with master

* master:
  .gitignore: "git-verify-commit" is a generated file
.gitignore