![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Marc Fournier <marc.fournier@camptocamp.com> | |
| Tue, 20 Sep 2016 19:23:09 +0000 (21:23 +0200) | ||
| committer | Marc Fournier <marc.fournier@camptocamp.com> | |
| Tue, 20 Sep 2016 19:23:09 +0000 (21:23 +0200) | ||
| commit | f7b05ebf3311b4c6cb5289f1f7cd8ee02918ef92 | |
| tree | d97f2493aea757144a4d564c32307fa215a548cb | tree | snapshot |
| parent | 7df2428077e2001fdfab3ebbb3bb74b0491b74bd | commit | diff |
| parent | 0b97cf2d91851a6892ff025c6775a59d98a8bada | commit | diff |
Merge branch 'collectd-5.4' into collectd-5.5
| src/daemon/common.c | diff1 | | | | blob | history |