merge branch into current, updating workdir
Merge pull request #1007 from ethomson/merge

merge!
Plug git_merge() related leaks
Merge pull request #1945 from libgit2/ntk/fix/merge_leaks

Plug git_merge() related leaks
Plug configuration file search paths leaks
Merge pull request #1944 from libgit2/ntk/fix/config_search_paths_leaks

Plug configuration file search paths tests leaks
Fix MSVC 64-bit warnings
Blame: change signature to be more binding-friendly
Change the git_branch_iterator_new and git_branch_next definitions to use git_branch_t.
Merge pull request #1946 from arthurschreiber/change-branch-iterator-definition

Change the git_branch_iterator_new definition to use git_branch_t
cmake: Add `USE_SSH` option
don't double free pkt
Merge pull request #1947 from ethomson/double_free_pkt

don't double free pkt