Merge branch 'master' into collectd-4

Conflicts:

	src/multimeter.c
	src/network.c
	src/utils_debug.c

diff --cc configure.in
Simple merge

diff --cc src/collectd.h
Simple merge

diff --cc src/common.c
index 6521a58bd1a07a376fda133faed70f549e122ed3,fd1fbd402194ee9c67fd886d60dc33d1a13a1b1d..bcdf59aafdbd8a52a36579073f49ff2bf9b6c8f8
--- 1/src/common.c
--- 2/src/common.c
+++ b/src/common.c
@@@ -20,8 -22,12 +20,12 @@@
   *   Niki W. Waibel <niki.waibel@gmx.net>
  **/
  
+ #if HAVE_CONFIG_H
+ # include "config.h"
+ #endif
+ 
  #include "common.h"
 -#include "utils_debug.h"
 +#include "plugin.h"
  
  #ifdef HAVE_MATH_H
  #  include <math.h>

diff --cc src/utils_ignorelist.c
index f71ac1d7abef01e6336acf9858c1fdea482bce28,d002c7aa47094ffe387817536bd6fddb2f2fd01c..d2546aab3db1a1506d909cb8309950d1195d4dab
--- 1/src/utils_ignorelist.c
--- 2/src/utils_ignorelist.c
+++ b/src/utils_ignorelist.c
@@@ -47,8 -47,12 +47,12 @@@
   *     return;
   **/
  
+ #if HAVE_CONFIG_H
+ # include "config.h"
+ #endif
+ 
  #include "common.h"
 -#include "utils_debug.h"
 +#include "plugin.h"
  #include "utils_ignorelist.h"
  
  /*

diff --cc src/utils_mount.c
Simple merge