From: Florian Forster <octo@collectd.org>
Date: Sun, 18 Aug 2013 10:14:39 +0000 (+0200)
Subject: Merge branch 'collectd-5.3'
X-Git-Tag: collectd-5.4.0~1
X-Git-Url: https://git.tokkee.org/?p=collectd.git;a=commitdiff_plain;h=c27675331d874c85625d2e64ebcc229db588c5f2

Merge branch 'collectd-5.3'

Conflicts:
	configure.in
---

c27675331d874c85625d2e64ebcc229db588c5f2
diff --cc configure.in
index 16bffbab,d207c288..c23df178
--- a/configure.in
+++ b/configure.in
@@@ -5452,8 -5259,7 +5452,8 @@@ Configuration
      libvirt . . . . . . . $enable_libvirt
      load  . . . . . . . . $enable_load
      logfile . . . . . . . $enable_logfile
-     lpar... . . . . . . . $enable_lpar
+     lpar  . . . . . . . . $enable_lpar
 +    lvm . . . . . . . . . $enable_lvm
      madwifi . . . . . . . $enable_madwifi
      match_empty_counter . $enable_match_empty_counter
      match_hashed  . . . . $enable_match_hashed