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)
1  2 
src/openvpn.c
src/processes.c

diff --cc src/openvpn.c
Simple merge
diff --cc src/processes.c
Simple merge