![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Tue, 6 May 2008 14:13:35 +0000 (16:13 +0200) | ||
| committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Tue, 6 May 2008 14:13:35 +0000 (16:13 +0200) | ||
| commit | 759c544568c019721fe868e7c319bd1471fd501c | |
| tree | dc16de780d3c81658133391fca703fc6985979b2 | tree | snapshot |
| parent | 53bd9256920f01cc5b835639c7e7971979ed3350 | commit | diff |
| parent | d45c77caacd134faa08f87cf8f5206499c5b1958 | commit | diff |
Merge branch 'collectd-4.2' into collectd-4.3
Conflicts:
configure.in
Conflicts:
configure.in
| configure.in | diff1 | | diff2 | | blob | history |