From: Florian Forster <sifnfors@faui02l.informatik.uni-erlangen.de>
Date: Mon, 10 Sep 2007 08:43:19 +0000 (+0200)
Subject: ChangeLog: Fix a merge bug.
X-Git-Tag: collectd-4.0.8~6^2
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=59d8ed329bdad86d73152c00e9e582f1086cef8b;p=collectd.git

ChangeLog: Fix a merge bug.
---

diff --git a/ChangeLog b/ChangeLog
index abe9f2e6..7ca33c9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,7 @@
 	  (i. e. without quotes).
 	* nut plugin: A fix allows linking the nut plugin against
 	  libupsclient, version >= 2.2.0.
+	* processes plugin: Fix a potential segmentation fault.
 
 2007-07-30, Version 4.0.6
 	* sensors plugin: Fix the ignorelist functionality: Only the `type