Ossi Salmi 29c6eb5b4d Merge tmakinen/puppet ... Conflicts: dns/manifests/init.pp		2012-12-03 00:23:32 +02:00
..
init.pp	Merge tmakinen/puppet	2012-12-03 00:23:32 +02:00