Code

octo@leeloo:~/collectd $ svn merge -r630:631 trunk branches/collectd-3.8