Code

octo@casella:~/collectd $ svn merge -r754:800 branches/ntpd trunk