Merge branch 'master' of git://github.com/example42/puppet-nagios
Merge branch 'master' of git://github.com/example42/puppet-nagios
Adding a $options parameter to all defines to be used in a custom template
Changing $options to $options_hash and empty hash as default value
Merge pull request #27 from lieutdan13/master

Adding a $options parameter to all defines for use in custom templates