Code

Merge branch 'collectd-5.1'
authorFlorian Forster <octo@collectd.org>
Fri, 7 Sep 2012 09:19:52 +0000 (11:19 +0200)
committerFlorian Forster <octo@collectd.org>
Fri, 7 Sep 2012 09:19:52 +0000 (11:19 +0200)
1  2 
src/Makefile.am
src/amqp.c
src/collectd.conf.pod
src/oracle.c
src/redis.c

diff --cc src/Makefile.am
Simple merge
diff --cc src/amqp.c
Simple merge
Simple merge
diff --cc src/oracle.c
Simple merge
diff --cc src/redis.c
Simple merge