Merge remote-tracking branch 'gh/infernalis'

author Sage Weil <sage@redhat.com>

Mon, 31 Aug 2015 15:29:14 +0000 (11:29 -0400)

committer Sage Weil <sage@redhat.com>

Mon, 31 Aug 2015 15:29:14 +0000 (11:29 -0400)
author Sage Weil <sage@redhat.com>
Mon, 31 Aug 2015 15:29:14 +0000 (11:29 -0400)
committer Sage Weil <sage@redhat.com>
Mon, 31 Aug 2015 15:29:14 +0000 (11:29 -0400)
diff --cc configure.ac
Simple merge
diff --cc src/test/Makefile.am
Simple merge
author	Sage Weil <sage@redhat.com>
	Mon, 31 Aug 2015 15:29:14 +0000 (11:29 -0400)
committer	Sage Weil <sage@redhat.com>
	Mon, 31 Aug 2015 15:29:14 +0000 (11:29 -0400)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history