thodg/libgit2

2017-10-29T12:08:00

Merge remote-tracking branch 'upstream/master' into diff-indent-heuristic