Merge branch 'collectd-5.1'

author Florian Forster <octo@collectd.org>

Fri, 7 Sep 2012 09:19:52 +0000 (11:19 +0200)

committer Florian Forster <octo@collectd.org>

Fri, 7 Sep 2012 09:19:52 +0000 (11:19 +0200)
author Florian Forster <octo@collectd.org>
Fri, 7 Sep 2012 09:19:52 +0000 (11:19 +0200)
committer Florian Forster <octo@collectd.org>
Fri, 7 Sep 2012 09:19:52 +0000 (11:19 +0200)
diff --cc src/Makefile.am
Simple merge
diff --cc src/amqp.c
Simple merge
diff --cc src/collectd.conf.pod
Simple merge
diff --cc src/oracle.c
Simple merge
diff --cc src/redis.c
Simple merge
author	Florian Forster <octo@collectd.org>
	Fri, 7 Sep 2012 09:19:52 +0000 (11:19 +0200)
committer	Florian Forster <octo@collectd.org>
	Fri, 7 Sep 2012 09:19:52 +0000 (11:19 +0200)
		1	2
src/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/amqp.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.pod	patch \|	diff1 \|	diff2 \|	blob \| history
src/oracle.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/redis.c	patch \|	diff1 \|	diff2 \|	blob \| history