![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@huhu.verplant.org> | |
| Wed, 30 May 2007 06:06:48 +0000 (08:06 +0200) | ||
| committer | Florian Forster <octo@huhu.verplant.org> | |
| Wed, 30 May 2007 06:06:48 +0000 (08:06 +0200) | ||
| commit | 721f8d81910c71154aba9ff8d243db52bfb584ed | |
| tree | bbb58eeaf1de337db1d4ec19753e324a0c60089b | tree | snapshot |
| parent | 011b30ce3a419d543040102bb3d077e7fbd4aa0f | commit | diff |
| parent | c75ed18827199e3d139c671256a9c61f0d8d4d8d | commit | diff |
Merge branch 'collectd-3.11'
Conflicts:
ChangeLog
configure.in
Conflicts:
ChangeLog
configure.in
| ChangeLog | diff1 | | diff2 | | blob | history |
| src/ntpd.c | diff1 | | diff2 | | blob | history |