Merge pull request #399 from carlosmn/free-null

author Vicent Martí <tanoku@gmail.com>

Mon, 19 Sep 2011 02:46:12 +0000 (19:46 -0700)

committer Vicent Martí <tanoku@gmail.com>

Mon, 19 Sep 2011 02:46:12 +0000 (19:46 -0700)
author Vicent Martí <tanoku@gmail.com>
Mon, 19 Sep 2011 02:46:12 +0000 (19:46 -0700)
committer Vicent Martí <tanoku@gmail.com>
Mon, 19 Sep 2011 02:46:12 +0000 (19:46 -0700)
diff --cc src/config.c
Simple merge
diff --cc src/remote.c
Simple merge
author	Vicent Martí <tanoku@gmail.com>
	Mon, 19 Sep 2011 02:46:12 +0000 (19:46 -0700)
committer	Vicent Martí <tanoku@gmail.com>
	Mon, 19 Sep 2011 02:46:12 +0000 (19:46 -0700)
		1	2
src/config.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/remote.c	patch \|	diff1 \|	diff2 \|	blob \| history