octo@leeloo:~/collectd $ svn merge -r812:815 branches/apcups trunk
authorocto <octo>
Sat, 10 Jun 2006 14:54:58 +0000 (14:54 +0000)
committerocto <octo>
Sat, 10 Jun 2006 14:54:58 +0000 (14:54 +0000)
commitbb18d8249033ec962eaed59651560e8f936d4a4e
treeff4ed0a5f6d232d2a011948c8daa17e47dc569df
parentb68b937de8b711f28cbac1440e6f6556b2f04809
parent6e318b5f03c2cc8ec0c6262498f4b62e59c8b505
octo@leeloo:~/collectd $ svn merge -r812:815 branches/apcups trunk