From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Fri, 1 May 2009 14:38:47 +0000 (+0200)
Subject: Merge branch 'collectd-4.6'
X-Git-Tag: collectd-4.7.0~35
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=330010ea9cf8dad458dc9245d8284a7dbf62b1a9;p=collectd.git

Merge branch 'collectd-4.6'

Conflicts:
	src/memcached.c
---

330010ea9cf8dad458dc9245d8284a7dbf62b1a9
diff --cc src/memcached.c
index 759ef512,5af20914..3421f824
--- a/src/memcached.c
+++ b/src/memcached.c
@@@ -1,8 -1,8 +1,9 @@@
  /**
   * collectd - src/memcached.c, based on src/hddtemp.c
-  * Copyright (C) 2007  Antony Dovgal
-  * Copyright (C) 2005,2006  Vincent Stehlé
-  * Copyright (C) 2009  Franck Lombardi
+  * Copyright (C) 2007       Antony Dovgal
+  * Copyright (C) 2007-2009  Florian Forster
+  * Copyright (C) 2009       Doug MacEachern
++ * Copyright (C) 2009       Franck Lombardi
   *
   * 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
@@@ -20,9 -20,8 +21,9 @@@
   *
   * Authors:
   *   Antony Dovgal <tony at daylessday dot org>
-  *   Vincent Stehlé <vincent.stehle at free.fr>
   *   Florian octo Forster <octo at verplant.org>
+  *   Doug MacEachern <dougm at hyperic.com>
 + *   Franck Lombardi
   **/
  
  #include "collectd.h"