Merge branch 'master' into issue_3953

author Gabriel Filion <lelutin@gmail.com>

Wed, 2 Jan 2013 12:32:12 +0000 (07:32 -0500)

committer Gabriel Filion <lelutin@gmail.com>

Wed, 2 Jan 2013 12:32:12 +0000 (07:32 -0500)
author Gabriel Filion <lelutin@gmail.com>
Wed, 2 Jan 2013 12:32:12 +0000 (07:32 -0500)
committer Gabriel Filion <lelutin@gmail.com>
Wed, 2 Jan 2013 12:32:12 +0000 (07:32 -0500)
diff --cc README
Simple merge
diff --cc manifests/init.pp
Simple merge
author	Gabriel Filion <lelutin@gmail.com>
	Wed, 2 Jan 2013 12:32:12 +0000 (07:32 -0500)
committer	Gabriel Filion <lelutin@gmail.com>
	Wed, 2 Jan 2013 12:32:12 +0000 (07:32 -0500)
		1	2
README	patch \|	diff1 \|	diff2 \|	blob \| history
manifests/init.pp	patch \|	diff1 \|	diff2 \|	blob \| history