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

author David Smith <dsmith@redhat.com>

Mon, 12 Dec 2016 15:35:34 +0000 (09:35 -0600)

committer David Smith <dsmith@redhat.com>

Mon, 12 Dec 2016 15:35:34 +0000 (09:35 -0600)
author David Smith <dsmith@redhat.com>
Mon, 12 Dec 2016 15:35:34 +0000 (09:35 -0600)
committer David Smith <dsmith@redhat.com>
Mon, 12 Dec 2016 15:35:34 +0000 (09:35 -0600)
diff --cc Makefile.am
Simple merge
diff --cc Makefile.in
Simple merge
diff --cc doc/beginners/Makefile.in
Simple merge
diff --cc java/Makefile.in
Simple merge
author	David Smith <dsmith@redhat.com>
	Mon, 12 Dec 2016 15:35:34 +0000 (09:35 -0600)
committer	David Smith <dsmith@redhat.com>
	Mon, 12 Dec 2016 15:35:34 +0000 (09:35 -0600)
		1	2
Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile.in	patch \|	diff1 \|	diff2 \|	blob \| history
doc/beginners/Makefile.in	patch \|	diff1 \|	diff2 \|	blob \| history
java/Makefile.in	patch \|	diff1 \|	diff2 \|	blob \| history