![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@collectd.org> | |
| Wed, 17 Jun 2015 12:52:22 +0000 (14:52 +0200) | ||
| committer | Florian Forster <octo@collectd.org> | |
| Wed, 17 Jun 2015 12:52:22 +0000 (14:52 +0200) | ||
| commit | f5adf265a374e5e0dba89a4a9903e7719dc57039 | |
| tree | 1c35c40ca743b0234cc6d0f2dcb226fe7d9cf050 | tree | snapshot |
| parent | cf33da9ad00ac94931a2c87563f8d007a996f1ad | commit | diff |
| parent | dd324a1592259913e6e92d3b54e6fa2b0c5f38f7 | commit | diff |
Merge branch 'collectd-5.4' into collectd-5.5
| src/email.c | diff1 | | diff2 | | blob | history |
| src/liboconfig/parser.y | diff1 | | diff2 | | blob | history |
| src/network.c | diff1 | | diff2 | | blob | history |