Code

octo@casella:~/collectd $ svn merge -r784:HEAD branches/apcups trunk