Merge remote branch 'upstream/master'
Merge pull request #29 from malavolti/master

Small fix for "check_cert.erb"
Merge pull request #30 from malavolti/master

Change 'check_cert' command on 'nagios.pp'
Merge pull request #31 from malavolti/master

Added 'check_phpldapadmin' command
Merge branch 'master' of https://github.com/malavolti/Puppet-Shibboleth
Logging
Merge remote branch 'upstream/master'