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
..
chrony.conf.erb	Updated all templates to use instance variables	2013-05-05 00:07:55 +03:00
ntp.conf.erb	ntp: Fixed IPv6 for isc-ntpd, template cleanup	2013-05-08 23:00:51 +03:00
openntpd.conf.erb	Updated all templates to use instance variables	2013-05-05 00:07:55 +03:00