Merge branch 'staging'
Merge branch 'staging'
Merge branch 'staging'
Merge branch 'staging'
Merge branch 'staging'
Merge branch 'staging'
Merge remote-tracking branch 'origin/staging'
Properly disable collectd on the server
Merge pull request #148 from mistio/collectd_script

Collectd script