Code

Merge branch 'collectd-5.4' into collectd-5.5
authorMarc Fournier <marc.fournier@camptocamp.com>
Tue, 26 Jan 2016 11:18:26 +0000 (12:18 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Tue, 26 Jan 2016 11:18:26 +0000 (12:18 +0100)
commitc21ce3b44f63d706b8b200a88047db74f1a51392
tree4d4094f81c315d6d724e4335f49f19f57af582b1
parentd0bdfe7df9b307fab2edb62f4171c87ec2004709
parentbb978c10e7b6cde5be79ade8b14fcdbb78f7b8ea
Merge branch 'collectd-5.4' into collectd-5.5
src/openvpn.c
src/processes.c