![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Marc Fournier <marc.fournier@camptocamp.com> | |
| Tue, 26 Jan 2016 11:18:26 +0000 (12:18 +0100) | ||
| committer | Marc Fournier <marc.fournier@camptocamp.com> | |
| Tue, 26 Jan 2016 11:18:26 +0000 (12:18 +0100) | ||
| commit | c21ce3b44f63d706b8b200a88047db74f1a51392 | |
| tree | 4d4094f81c315d6d724e4335f49f19f57af582b1 | tree | snapshot |
| parent | d0bdfe7df9b307fab2edb62f4171c87ec2004709 | commit | diff |
| parent | bb978c10e7b6cde5be79ade8b14fcdbb78f7b8ea | commit | diff |
Merge branch 'collectd-5.4' into collectd-5.5
| src/openvpn.c | diff1 | | diff2 | | blob | history |
| src/processes.c | diff1 | | diff2 | | blob | history |