added option for enabling notification env macros even if lit are enabled
added enable_environment_macros and disable_environment_macros to commands
added enable_environment_macros and disable_environment_macros to commands
Merge pull request #911 from 5c077yP/merge_service_contacts_with_host_contacts

Merge service contacts with host contacts
Revert "added explicit config to merge contacts from host to service"

This reverts commit bbcdeb74007aff48e5a312ebc40bdb28c6732156.
Revert "forgot changes in item.py"

This reverts commit 67cba6eca02dfb9b466d5ea3f2a6a442c7a955bc.
Revert "merge service contacts with host contacts"

This reverts commit d93e4b23230e238bc727022ab79b3340b2078345.
adding two more test cases for timeperiods
time typo
Merge branch 'branch-1.4' of https://github.com/naparuba/shinken into branch-1.4
solving the timeperiod testcases now
perf should return None 

as it can be mistaken later for metric value, which can be also 1.
or is there another way to determine which 1 it'is False or just 1?
Added business rules output.

Adds business rules based services output using an additionnal service
attribute named "business_rule_output_template". This attribute contains
a template string which macros are expanded with service attributes
to build its output on the "manage_internal_checks" scheduler step.
Fix: Change path to shinken.cfg file rather than shinken-specific.cfg
Merge branch 'master' into sydel
Added detailled notifications ways and command
Adjust notifications command
Added check_ipmi_sensor to default plugins
Fix typo :)
Merge branch 'master' into sydel

Conflicts:
	etc/commands.cfg