From: octo <octo>
Date: Tue, 6 Jun 2006 08:05:39 +0000 (+0000)
Subject: octo@leeloo:~/collectd $ svn merge -r737:784 branches/apcups trunk
X-Git-Tag: svn-trunk~15
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=09cc422eeae5dd0fa1e5f1f6b472b8c959b315d9;p=collectd.git

octo@leeloo:~/collectd $ svn merge -r737:784 branches/apcups trunk

The trunk did not compile with the `apcups' plugin enabled. Since it's enabled
by default some extra action was neccessary. The `apcups' plugin in the branch
compiles and may be useable, so I'm merging it back to get to some consistent
state.
---

09cc422eeae5dd0fa1e5f1f6b472b8c959b315d9