Merge branch 'master' into trac2266

author Mukund Sivaraman <muks@isc.org>

Thu, 11 Oct 2012 06:49:00 +0000 (12:19 +0530)

committer Mukund Sivaraman <muks@isc.org>

Thu, 11 Oct 2012 06:49:00 +0000 (12:19 +0530)
author Mukund Sivaraman <muks@isc.org>
Thu, 11 Oct 2012 06:49:00 +0000 (12:19 +0530)
committer Mukund Sivaraman <muks@isc.org>
Thu, 11 Oct 2012 06:49:00 +0000 (12:19 +0530)
diff --cc src/lib/datasrc/memory/memory_client.cc
Simple merge
diff --cc src/lib/datasrc/tests/memory/memory_client_unittest.cc
Simple merge
diff --cc src/lib/dns/Makefile.am
Simple merge
author	Mukund Sivaraman <muks@isc.org>
	Thu, 11 Oct 2012 06:49:00 +0000 (12:19 +0530)
committer	Mukund Sivaraman <muks@isc.org>
	Thu, 11 Oct 2012 06:49:00 +0000 (12:19 +0530)
		1	2
src/lib/datasrc/memory/memory_client.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/lib/datasrc/tests/memory/memory_client_unittest.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/lib/dns/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history