Merge branch 'master' of https://github.com/saschpe/libgit2 into saschpe-master Conflicts: CMakeLists.txt