octo@leeloo:~/collectd $ svn merge -r773:777 branches/collectd-3.9 trunk
authorocto <octo>
Thu, 1 Jun 2006 20:53:20 +0000 (20:53 +0000)
committerocto <octo>
Thu, 1 Jun 2006 20:53:20 +0000 (20:53 +0000)
commita9a298a54644fc7f88b0eed31357706ac5912fdd
treefdd8ccfa5f2933027342f775e8ec50c649c86bfb
parentc986289dbe7edfcee5cd39a61e95f1c4a59ddcde
parent7e1b5b5ae8bcbb0ebecade06ba521b324ddd0815
octo@leeloo:~/collectd $ svn merge -r773:777 branches/collectd-3.9 trunk
ChangeLog
collectd.spec
configure.in
debian/changelog
src/liboping/liboping.c