From: octo <octo>
Date: Fri, 16 Jun 2006 23:02:01 +0000 (+0000)
Subject: octo@leeloo:~/collectd $ svn merge -r822:823 branches/disk-linux trunk
X-Git-Tag: svn-trunk~1
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=81a3ec19d95506446372371a45e3aa24ab24c722;p=collectd.git

octo@leeloo:~/collectd $ svn merge -r822:823 branches/disk-linux trunk
---

81a3ec19d95506446372371a45e3aa24ab24c722