![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
| Fri, 24 Feb 2017 16:55:12 +0000 (17:55 +0100) | ||
| committer | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
| Fri, 24 Feb 2017 16:55:12 +0000 (17:55 +0100) | ||
| commit | c3d354c58d56c4b2bb4138a227f3546928bd84f2 | |
| tree | f2f94d2d7f9851e109ba2249cf8018a9bd1e49f4 | tree | snapshot |
| parent | 64b8150edec2271bb110f36e70915fdd87d9cac2 | commit | diff |
| parent | 11c8a760c2d354b2f4637bdb297efb253bfaa519 | commit | diff |
Merge branch 'collectd-5.7'
Conflicts:
configure.ac
Conflicts:
configure.ac
| configure.ac | diff1 | | diff2 | | blob | history |
| src/daemon/common.c | diff1 | | diff2 | | blob | history |