From: octo <octo>
Date: Sat, 10 Jun 2006 14:54:58 +0000 (+0000)
Subject: octo@leeloo:~/collectd $ svn merge -r812:815 branches/apcups trunk
X-Git-Tag: svn-trunk~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=bb18d8249033ec962eaed59651560e8f936d4a4e;p=collectd.git

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

bb18d8249033ec962eaed59651560e8f936d4a4e