From: Sebastian Harl <sh@tokkee.org>
Date: Fri, 29 May 2009 13:01:57 +0000 (+0200)
Subject: Merged branch 'master' of git://git.tokkee.org/pkg-collectd.
X-Git-Tag: collectd-4.7.2-1~38^2^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d1eac2b983d36e6e49f24c28382273aeed15c82b;p=pkg-collectd.git

Merged branch 'master' of git://git.tokkee.org/pkg-collectd.
---

d1eac2b983d36e6e49f24c28382273aeed15c82b
diff --cc debian/patches/00list
index 1a38c72,332b35c..16268ce
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@@ -1,6 -1,3 +1,4 @@@
  rrd_filter_path.dpatch
  collection_conf_path.dpatch
- battery_acpi_complain.dpatch
- ntpd_type_pun_fix.dpatch
 +include_empty_files.dpatch