Collectd client/server
Phpldapadmin in Italian
Merge remote-tracking branch 'origin/master'

Conflicts resolved:
	garr/shib2idp/manifests/classes/management/collectd.pp
	garr/shib2idp/manifests/classes/management/management.pp
	garr/shib2idp/manifests/classes/management/phpldap.pp
	garr/shib2idp/manifests/definitions/instance.pp
	garr/shib2idp/templates/monitoring/phpldapconfig.erb