From: octo <octo>
Date: Thu, 15 Jun 2006 21:51:52 +0000 (+0000)
Subject: octo@leeloo:~/collectd $ svn merge -r786:HEAD branches/freebsd trunk
X-Git-Tag: svn-trunk~2
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=6f7f9185a4b85b442d26821b5df8742466d2e682;p=collectd.git

octo@leeloo:~/collectd $ svn merge -r786:HEAD branches/freebsd trunk
---

6f7f9185a4b85b442d26821b5df8742466d2e682