![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Fri, 18 Dec 2009 10:26:20 +0000 (11:26 +0100) | ||
| committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Fri, 18 Dec 2009 10:26:20 +0000 (11:26 +0100) | ||
| commit | 557b23d4bc8eb6ca64eab72b2d768112486f5001 | |
| tree | e609607f47c2b15ae5b73480fe6a54251205bdc8 | tree | snapshot |
| parent | 5ad3a491af300d7336112607e20b0364d1f3f2bb | commit | diff |
| parent | a4ddcbc7984bd1fd62d3b973ef4c371d95da7dbf | commit | diff |
Merge branch 'collectd-4.8' into collectd-4.9
Conflicts:
ChangeLog
Conflicts:
ChangeLog
| ChangeLog | diff1 | | diff2 | | blob | history |
| src/network.c | diff1 | | diff2 | | blob | history |
| version-gen.sh | diff1 | | diff2 | | blob | history |