Merge Trond

author Brian Aker <brian@tangent.org>

Wed, 15 Sep 2010 00:44:32 +0000 (17:44 -0700)

committer Brian Aker <brian@tangent.org>

Wed, 15 Sep 2010 00:44:32 +0000 (17:44 -0700)
author Brian Aker <brian@tangent.org>
Wed, 15 Sep 2010 00:44:32 +0000 (17:44 -0700)
committer Brian Aker <brian@tangent.org>
Wed, 15 Sep 2010 00:44:32 +0000 (17:44 -0700)
diff --cc configure.ac
Simple merge
diff --cc libmemcached/io.c
Simple merge
diff --cc tests/include.am
Simple merge
author	Brian Aker <brian@tangent.org>
	Wed, 15 Sep 2010 00:44:32 +0000 (17:44 -0700)
committer	Brian Aker <brian@tangent.org>
	Wed, 15 Sep 2010 00:44:32 +0000 (17:44 -0700)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
libmemcached/io.c	patch \|	diff1 \|	diff2 \|	blob \| history
tests/include.am	patch \|	diff1 \|	diff2 \|	blob \| history