![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
| Fri, 26 Feb 2016 21:53:19 +0000 (22:53 +0100) | ||
| committer | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
| Fri, 26 Feb 2016 21:53:19 +0000 (22:53 +0100) | ||
| commit | 3307054b6ab46b51fdda4f528e72d119e9de3071 | |
| tree | 6390c419b9f98b5b12fc5d102b06676ed136d921 | tree | snapshot |
| parent | f7f5868ee0378791ccd8d1788e27ebf2a02737dc | commit | diff |
| parent | 9c0d7874312b86db7ca94c12f1285ae6d1cb0c1a | commit | diff |
Merge branch 'collectd-5.4' into collectd-5.5
| configure.ac | diff1 | | diff2 | | blob | history |
| src/apache.c | diff1 | | diff2 | | blob | history |
| src/collectd.conf.in | diff1 | | diff2 | | blob | history |
| src/modbus.c | diff1 | | diff2 | | blob | history |