Code

Merge branch 'collectd-5.4' into collectd-5.5
authorFlorian Forster <octo@collectd.org>
Thu, 17 Dec 2015 14:18:45 +0000 (15:18 +0100)
committerFlorian Forster <octo@collectd.org>
Thu, 17 Dec 2015 14:18:45 +0000 (15:18 +0100)
commit0a63e4493d92f7d739a1849bc65d4e971b047004
tree0256c60647002ae32429ec43bb62160758db1b57
parentea3a86f0ff50f12650aae7eea033984a8ae0eba5
parent5a223866595c0d7eb032c3c4fc3c7cd148e59f99
Merge branch 'collectd-5.4' into collectd-5.5
src/email.c
src/gmond.c
src/perl.c