Merge pull request #218 from dduvnjak/master

author Aaron Stone <aaron@serendipity.cx>

Mon, 19 Jan 2015 05:43:27 +0000 (21:43 -0800)

committer Aaron Stone <aaron@serendipity.cx>

Mon, 19 Jan 2015 05:43:27 +0000 (21:43 -0800)
author Aaron Stone <aaron@serendipity.cx>
Mon, 19 Jan 2015 05:43:27 +0000 (21:43 -0800)
committer Aaron Stone <aaron@serendipity.cx>
Mon, 19 Jan 2015 05:43:27 +0000 (21:43 -0800)
diff --cc README.markdown
Simple merge
diff --cc lib/puppet/provider/vcsrepo/git.rb
Simple merge
diff --cc lib/puppet/type/vcsrepo.rb
Simple merge
author	Aaron Stone <aaron@serendipity.cx>
	Mon, 19 Jan 2015 05:43:27 +0000 (21:43 -0800)
committer	Aaron Stone <aaron@serendipity.cx>
	Mon, 19 Jan 2015 05:43:27 +0000 (21:43 -0800)
		1	2
README.markdown	patch \|	diff1 \|	diff2 \|	blob \| history
lib/puppet/provider/vcsrepo/git.rb	patch \|	diff1 \|	diff2 \|	blob \| history
lib/puppet/type/vcsrepo.rb	patch \|	diff1 \|	diff2 \|	blob \| history