octo@leeloo:~/collectd $ svn merge -r812:815 branches/apcups trunk