![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@noris.net> | |
| Mon, 14 Jul 2008 07:46:27 +0000 (09:46 +0200) | ||
| committer | Florian Forster <octo@noris.net> | |
| Mon, 14 Jul 2008 07:46:27 +0000 (09:46 +0200) | ||
| commit | 654783aed1fab02766a9cc036e859799e01f6f9e | |
| tree | 2014d42c1241d71f5f9ab2d08481e58c1ab7d756 | tree | snapshot |
| parent | 752e52bc98874f891ae0756b6ab8ccb9a2442650 | commit | diff |
| parent | 4e51eefd95e80f90eae602958713c9c630659ce7 | commit | diff |
Merge branch 'collectd-4.4'
Conflicts:
configure.in
Conflicts:
configure.in
| configure.in | diff1 | | diff2 | | blob | history |
| src/ntpd.c | diff1 | | diff2 | | blob | history |