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
..
manifests	ntp: Document IPv6 usage	2013-05-08 23:49:40 +03:00
templates	Merge branch 'puppet3'	2013-05-24 10:10:57 +03:00