From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Wed, 1 Nov 2006 15:39:51 +0000 (+0100)
Subject: Merge branch 'collectd-3.10'
X-Git-Tag: collectd-3.11.0~61^2~3
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=961f67433e56597c91baf46cfb63a9b89fa41134

Merge branch 'collectd-3.10'
---

961f67433e56597c91baf46cfb63a9b89fa41134
diff --cc debian/control
index 9c0e11b4,87d1f75b..f9f8f3c2
--- a/debian/control
+++ b/debian/control
@@@ -46,5 -131,6 +131,5 @@@ Description: statistics collection daem
   it's very fast and easy on the system. Also, the statistics are very fine
   grained since the files are updated every 10 seconds.
   .
-  This package contains the multimeter plugin which collects values from a
-  multimeter connected to a serial port.
+  This package contains the development files needed to create your own
+  plugins.
 -