Ossi Salmi 49a8ae3004 Merge branch 'puppet3' ... Conflicts: ntpd/templates/ntp.conf.erb wiki/templates/collab-wsgi.conf.erb		2013-05-24 10:10:57 +03:00
..
files	Added rpmfusion signing keys for Fedora 18.	2013-01-17 09:02:25 +02:00
manifests	yum: Use https for puppetlabs repos	2013-05-24 09:54:12 +03:00
templates	Updated all templates to use instance variables	2013-05-05 00:07:55 +03:00