Merge pull request #697 from carlosmn/ssl

author Vicent Martí <tanoku@gmail.com>

Tue, 5 Jun 2012 20:53:33 +0000 (13:53 -0700)

committer Vicent Martí <tanoku@gmail.com>

Tue, 5 Jun 2012 20:53:33 +0000 (13:53 -0700)
author Vicent Martí <tanoku@gmail.com>
Tue, 5 Jun 2012 20:53:33 +0000 (13:53 -0700)
committer Vicent Martí <tanoku@gmail.com>
Tue, 5 Jun 2012 20:53:33 +0000 (13:53 -0700)
diff --cc CMakeLists.txt
Simple merge
diff --cc include/git2/remote.h
Simple merge
diff --cc src/netops.c
Simple merge
diff --cc src/remote.c
Simple merge
diff --cc src/transports/git.c
Simple merge
diff --cc src/transports/http.c
Simple merge
author	Vicent Martí <tanoku@gmail.com>
	Tue, 5 Jun 2012 20:53:33 +0000 (13:53 -0700)
committer	Vicent Martí <tanoku@gmail.com>
	Tue, 5 Jun 2012 20:53:33 +0000 (13:53 -0700)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
include/git2/remote.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/netops.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/remote.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/transports/git.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/transports/http.c	patch \|	diff1 \|	diff2 \|	blob \| history