Ossi Salmi 98767cfb2a Merge tmakinen/puppet ... Conflicts: dovecot/manifests/init.pp libvirt/manifests/init.pp munin/manifests/init.pp puppet/manifests/init.pp tftp/manifests/init.pp		2012-11-16 19:40:31 +02:00
..
files	Moved moin htdocs apache configs to separate file	2012-07-17 17:14:48 +03:00
manifests	Merge tmakinen/puppet	2012-11-16 19:40:31 +02:00
templates	Added support for multiple collab virtualhosts	2011-07-07 02:23:29 +03:00
Makefile	Updated moin version to 1.9.4 in wiki/Makefile	2012-08-02 14:09:53 +03:00