Ossi Salmi 29c6eb5b4d Merge tmakinen/puppet ... Conflicts: dns/manifests/init.pp		2012-12-03 00:23:32 +02:00
..
files	minor fix to dnsdump.py	2012-04-02 12:28:27 +03:00
manifests	Merge tmakinen/puppet	2012-12-03 00:23:32 +02:00
templates	Fixed dns slave zone template	2012-11-19 11:10:54 +02:00