Merge remote-tracking branch 'origin/master' into dsmith/interactive

author David Smith <dsmith@redhat.com>

Mon, 12 Oct 2015 16:22:05 +0000 (11:22 -0500)

committer David Smith <dsmith@redhat.com>

Mon, 12 Oct 2015 16:22:05 +0000 (11:22 -0500)
author David Smith <dsmith@redhat.com>
Mon, 12 Oct 2015 16:22:05 +0000 (11:22 -0500)
committer David Smith <dsmith@redhat.com>
Mon, 12 Oct 2015 16:22:05 +0000 (11:22 -0500)
diff --cc configure
Simple merge
diff --cc configure.ac
Simple merge
diff --cc elaborate.cxx
Simple merge
diff --cc systemtap.spec
Simple merge
author	David Smith <dsmith@redhat.com>
	Mon, 12 Oct 2015 16:22:05 +0000 (11:22 -0500)
committer	David Smith <dsmith@redhat.com>
	Mon, 12 Oct 2015 16:22:05 +0000 (11:22 -0500)
		1	2
configure	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
elaborate.cxx	patch \|	diff1 \|	diff2 \|	blob \| history
systemtap.spec	patch \|	diff1 \|	diff2 \|	blob \| history