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
..
files	Changed ejabberd rewrite proxy from /jabber/ to /bosh/	2012-07-31 19:42:31 +03:00
manifests	ejabberd: semanage port for bosh	2013-05-17 14:24:09 +03:00
templates	Merge branch 'puppet3'	2013-05-24 10:10:57 +03:00