From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Fri, 17 Apr 2009 23:06:23 +0000 (+0200)
Subject: Merge branch 'collectd-4.6'
X-Git-Tag: collectd-4.7.0~61
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=cfb86a0f119d0ee0e72a920ba1251bb0350cf08b;p=collectd.git

Merge branch 'collectd-4.6'

Conflicts:
	src/mysql.c
	src/ping.c
---

cfb86a0f119d0ee0e72a920ba1251bb0350cf08b
diff --cc src/mysql.c
index a129f40f,cd1ff9d3..ca5c525d
--- a/src/mysql.c
+++ b/src/mysql.c
@@@ -1,8 -1,7 +1,9 @@@
  /**
   * collectd - src/mysql.c
 - * Copyright (C) 2006–2008  Florian octo Forster
 + * Copyright (C) 2006-2009  Florian octo Forster
-  * Copyright (C) 2009  Doug MacEachern
-  * Copyright (C) 2009  Sebastian tokkee Harl
+  * Copyright (C) 2008       Mirko Buffoni
++ * Copyright (C) 2009       Doug MacEachern
++ * Copyright (C) 2009       Sebastian tokkee Harl
   *
   * This program is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License as published by the