octo@casella:~/collectd $ svn merge -r754:800 branches/ntpd trunk
authorocto <octo>
Sat, 10 Jun 2006 11:31:52 +0000 (11:31 +0000)
committerocto <octo>
Sat, 10 Jun 2006 11:31:52 +0000 (11:31 +0000)
commitae63361fe92090051cb08f2e6ad49d8dd135b3eb
tree366f6d565e5fa9b070bb571a9a5e7bef89f074e0
parentef95431fe621a3edc390e5b480f00de8c25f3cef
parente864bcaff1a5205ab6fcdd34281544fe6a56c0fe
octo@casella:~/collectd $ svn merge -r754:800 branches/ntpd trunk
octo@casella:~/collectd $ svn rm branches/ntpd
configure.in
contrib/collection.cgi
src/Makefile.am