![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
| Sun, 5 Mar 2017 16:21:11 +0000 (17:21 +0100) | ||
| committer | Ruben Kerkhof <ruben@rubenkerkhof.com> | |
| Sun, 5 Mar 2017 16:21:11 +0000 (17:21 +0100) | ||
| commit | 9717b1a55d60d992c16e66e2ae5bdfb42f80aca8 | |
| tree | eb31b310953306dde6a0b822134480c56f709b3c | tree | snapshot |
| parent | 79a94204db8de144bf5bd84159afde444df9e0a4 | commit | diff |
| parent | ffaf9b893b6042a76e1c0dadd83ce06904fcc89a | commit | diff |
Merge branch 'collectd-5.7'
Conflicts:
configure.ac
Conflicts:
configure.ac
| configure.ac | diff1 | | diff2 | | blob | history |