Merging Trond

author Brian Aker <brian@gir-3.local>

Wed, 17 Jun 2009 16:07:02 +0000 (09:07 -0700)

committer Brian Aker <brian@gir-3.local>

Wed, 17 Jun 2009 16:07:02 +0000 (09:07 -0700)
author Brian Aker <brian@gir-3.local>
Wed, 17 Jun 2009 16:07:02 +0000 (09:07 -0700)
committer Brian Aker <brian@gir-3.local>
Wed, 17 Jun 2009 16:07:02 +0000 (09:07 -0700)
diff --cc .bzrignore
Simple merge
diff --cc libmemcached/Makefile.am
Simple merge
diff --cc libmemcached/memcached.h
Simple merge
author	Brian Aker <brian@gir-3.local>
	Wed, 17 Jun 2009 16:07:02 +0000 (09:07 -0700)
committer	Brian Aker <brian@gir-3.local>
	Wed, 17 Jun 2009 16:07:02 +0000 (09:07 -0700)
		1	2
.bzrignore	patch \|	diff1 \|	diff2 \|	blob \| history
libmemcached/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
libmemcached/memcached.h	patch \|	diff1 \|	diff2 \|	blob \| history