From: octo <octo>
Date: Sat, 10 Jun 2006 11:15:01 +0000 (+0000)
Subject: octo@casella:~/collectd $ svn merge -r784:HEAD branches/apcups trunk
X-Git-Tag: svn-trunk~13
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=ef95431fe621a3edc390e5b480f00de8c25f3cef;p=collectd.git

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

ef95431fe621a3edc390e5b480f00de8c25f3cef