octo@casella:~/collectd $ svn merge -r784:HEAD branches/apcups trunk
authorocto <octo>
Sat, 10 Jun 2006 11:15:01 +0000 (11:15 +0000)
committerocto <octo>
Sat, 10 Jun 2006 11:15:01 +0000 (11:15 +0000)
commitef95431fe621a3edc390e5b480f00de8c25f3cef
treeaab1458a39772f91a1f4a50682b7152972291a8d
parentf5adb596f44489eef9f59238277f21c948685a64
parent86294767df94d8d6a982556257052836a93641bd
octo@casella:~/collectd $ svn merge -r784:HEAD branches/apcups trunk