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)
commit59dded4cc1a2077ad11c6e9b507e15ad19e0e38c
tree1427504601dff5bf9dde4891ef042412c002c0d8
parent0abfaa6a32babf3b2cbb34fce097d9f62fb2bc44
parentfda68e239798cea197a225ed5325f5bb3c2e70de
Merge branch 'collectd-5.1'
src/Makefile.am
src/amqp.c
src/collectd.conf.pod
src/oracle.c
src/redis.c