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

Conflicts:
	CMakeLists.txt

diff --cc CMakeLists.txt
index 7fb373bf68d1b6918b177edd1fe1e74f2b77835c,2fdbec98e6ad6a6ee63fb8e6ae99db7c4e29eb7d..2a29fcda9d42badfd5ddc7e0818428a9cce668f2
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -79,7 -74,8 +79,8 @@@ ENDIF (
  
  # Compile and link libgit2
  ADD_LIBRARY(git2 ${SRC} ${SRC_PLAT} ${SRC_SHA1})
 -TARGET_LINK_LIBRARIES(git2 ${ZLIB_LIBRARY} ${LIB_SHA1} ${PTHREAD_LIBRARY})
 +TARGET_LINK_LIBRARIES(git2 ${ZLIB_LIBRARY} ${LIB_SHA1} ${PTHREAD_LIBRARY} ${SQLITE3_LIBRARIES})
+ SET_TARGET_PROPERTIES(git2 PROPERTIES VERSION 0.0.1 SOVERSION 0)
  
  # Install
  INSTALL(TARGETS git2