Merge branch 'collectd-4.5' into collectd-4.6

Conflicts:
	src/cpu.c

diff --cc src/battery.c
Simple merge

diff --cc src/cpu.c
index 8a4e10e,66cd261..64ce5df
--- 1/src/cpu.c
--- 2/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"

diff --cc src/interface.c
Simple merge

diff --cc src/memory.c
Simple merge

diff --cc src/ping.c
Simple merge

diff --cc src/processes.c
Simple merge