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

Merge branch 'collectd-4.5' into collectd-4.6

Conflicts:
	src/cpu.c
---

9b626288aff81c68fe19210a58b4a32eeefde9d3
diff --cc src/cpu.c
index 8a4e10e6,66cd261a..64ce5df9
--- a/src/cpu.c
+++ b/src/cpu.c
@@@ -1,7 -1,7 +1,8 @@@
  /**
   * collectd - src/cpu.c
   * Copyright (C) 2005-2009  Florian octo Forster
-  * Copyright (C) 2009 Simon Kuhnle
+  * Copyright (C) 2008       Oleg King
++ * Copyright (C) 2009       Simon Kuhnle
   *
   * 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
@@@ -18,7 -18,7 +19,8 @@@
   *
   * Authors:
   *   Florian octo Forster <octo at verplant.org>
+  *   Oleg King <king2 at kaluga.ru>
 + *   Simon Kuhnle <simon at blarzwurst.de>
   **/
  
  #include "collectd.h"