OnCenterSoftware/collectd-formula — pull request #2 by iggy (2014-11-06 16:27:22+00:00)
Title: Merge with upstream branch

All of my changes have been fed cleanly to upstream. It now has all of the changes we have been running locally.