![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
| Wed, 25 May 2016 14:54:54 +0000 (16:54 +0200) | ||
| committer | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
| Wed, 25 May 2016 14:54:54 +0000 (16:54 +0200) | ||
| commit | c11a279ed19722816ccc56537a7d928ed06c6bab | |
| tree | 2acfa97aea779a505f99d17e05ac2aa9bb261b27 | tree | snapshot |
| parent | a9463994041a275662c555d883521d0c8c23e812 | commit | diff |
| parent | 2c7b491427fd84c9e24c9d41686a15ce42219a0b | commit | diff |
Merge branch 'collectd-5.5'
Conflicts:
configure.ac
Conflicts:
configure.ac
| configure.ac | diff1 | | diff2 | | blob | history |
| src/Makefile.am | diff1 | | diff2 | | blob | history |
| src/collectd.conf.in | diff1 | | diff2 | | blob | history |
| src/processes.c | diff1 | | diff2 | | blob | history |