* Back port of the last changes of collectd module
Merge branch 'branch-1.4' of github.com:titilambert/shinken into branch-1.4