![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Sat, 28 Feb 2009 09:35:04 +0000 (10:35 +0100) | ||
| committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Sat, 28 Feb 2009 09:35:04 +0000 (10:35 +0100) | ||
| commit | 6e419a825c50f9c97471aba7d50521bfc7e19828 | |
| tree | fe4deec04333c10999c534153f1d64789d9c1034 | tree | snapshot |
| parent | e1e33fa276c657f0f0f91f60155a99017fbef72b | commit | diff |
| parent | b0608a28c996eae0dd407886154f6e8797b3545c | commit | diff |
Merge branch 'collectd-4.5' into collectd-4.6
| src/common.c | diff1 | | diff2 | | blob | history |
| src/dns.c | diff1 | | diff2 | | blob | history |