:Q
:
test2
Merge branch 'master' of github.com:madpawel/Puppet

Conflicts:
	manifests/site.pp
	modules/base/manifests/apps.pp
poprawki