![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@collectd.org> | |
| Wed, 2 Nov 2016 08:20:57 +0000 (09:20 +0100) | ||
| committer | Florian Forster <octo@collectd.org> | |
| Wed, 2 Nov 2016 08:20:57 +0000 (09:20 +0100) | ||
| commit | 4979d8dcd6f097eb8fd4661086e28accd31ff905 | |
| tree | 38524f51b6da612d55d17e8b8587464d216cd06b | tree | snapshot |
| parent | d2b9c4b3bc02ebe5fac8b1f29013c542c16a620a | commit | diff |
| parent | 55ef2778ade050e2924eeb027c98feea103f1585 | commit | diff |
Merge branch 'collectd-5.5' into collectd-5.6
| configure.ac | diff1 | | diff2 | | blob | history |
| src/battery.c | diff1 | | diff2 | | blob | history |
| src/powerdns.c | diff1 | | diff2 | | blob | history |
| src/utils_format_graphite.c | diff1 | | diff2 | | blob | history |