Merge branch 'collectd-5.3'
authorFlorian Forster <octo@collectd.org>
Fri, 12 Jul 2013 16:23:20 +0000 (18:23 +0200)
committerFlorian Forster <octo@collectd.org>
Fri, 12 Jul 2013 16:23:20 +0000 (18:23 +0200)
Conflicts:
src/collectd.conf.pod

1  2 
src/collectd.conf.pod
src/common.c
src/configfile.c
src/types.db
src/varnish.c
src/write_riemann.c

Simple merge
diff --cc src/common.c
Simple merge
Simple merge
diff --cc src/types.db
Simple merge
diff --cc src/varnish.c
Simple merge
Simple merge