Merge pull request #475 from DavidS/document-puppet4-compat

author TP Honey <tphoney@users.noreply.github.com>

Thu, 9 Jul 2015 17:30:26 +0000 (18:30 +0100)

committer TP Honey <tphoney@users.noreply.github.com>

Thu, 9 Jul 2015 17:30:26 +0000 (18:30 +0100)
author TP Honey <tphoney@users.noreply.github.com>
Thu, 9 Jul 2015 17:30:26 +0000 (18:30 +0100)
committer TP Honey <tphoney@users.noreply.github.com>
Thu, 9 Jul 2015 17:30:26 +0000 (18:30 +0100)
diff --cc README.markdown
Simple merge
diff --cc metadata.json
Simple merge
author	TP Honey <tphoney@users.noreply.github.com>
	Thu, 9 Jul 2015 17:30:26 +0000 (18:30 +0100)
committer	TP Honey <tphoney@users.noreply.github.com>
	Thu, 9 Jul 2015 17:30:26 +0000 (18:30 +0100)
		1	2
README.markdown	patch \|	diff1 \|	diff2 \|	blob \| history
metadata.json	patch \|	diff1 \|	diff2 \|	blob \| history