Merge pull request #1030 from pwkelley/transports

author Vicent Martí <vicent@github.com>

Thu, 1 Nov 2012 16:15:29 +0000 (09:15 -0700)

committer Vicent Martí <vicent@github.com>

Thu, 1 Nov 2012 16:15:29 +0000 (09:15 -0700)
author Vicent Martí <vicent@github.com>
Thu, 1 Nov 2012 16:15:29 +0000 (09:15 -0700)
committer Vicent Martí <vicent@github.com>
Thu, 1 Nov 2012 16:15:29 +0000 (09:15 -0700)
diff --cc include/git2.h
Simple merge
diff --cc src/remote.c
Simple merge
author	Vicent Martí <vicent@github.com>
	Thu, 1 Nov 2012 16:15:29 +0000 (09:15 -0700)
committer	Vicent Martí <vicent@github.com>
	Thu, 1 Nov 2012 16:15:29 +0000 (09:15 -0700)
		1	2
include/git2.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/remote.c	patch \|	diff1 \|	diff2 \|	blob \| history