From: Florian Forster <octo@huhu.verplant.org>
Date: Wed, 7 Apr 2010 09:55:15 +0000 (+0200)
Subject: Merge branch 'collectd-4.8' into collectd-4.9
X-Git-Tag: collectd-4.9.2~3
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=07be522384e753b7921213a0dc96a50336c79a66;p=collectd.git

Merge branch 'collectd-4.8' into collectd-4.9
---

07be522384e753b7921213a0dc96a50336c79a66
diff --cc src/collectd.conf.in
index 844c83be,688c297a..c047a1a6
--- a/src/collectd.conf.in
+++ b/src/collectd.conf.in
@@@ -562,10 -502,9 +562,10 @@@ FQDNLookup   tru
  
  #<Plugin perl>
  #	IncludeDir "/my/include/path"
- #	BaseName "Collectd::Plugin"
+ #	BaseName "Collectd::Plugins"
  #	EnableDebugger ""
 -#	LoadPlugin foo
 +#	LoadPlugin Monitorus
 +#	LoadPlugin OpenVZ
  #
  #	<Plugin foo>
  #		Foo "Bar"