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)
commit38d06a8f868293466f4eee943555c65457a5e560
tree2c27d77cdac80c1d0246c01722d15369fc0f41d2
parenta02ced789b4c93f293dc9d14a5a303c5fe11bcce
parentbc389fa32a48a64306f7ec008f4548f05fdb7c80
Merge branch 'collectd-5.3'

Conflicts:
src/collectd.conf.pod
src/collectd.conf.pod
src/common.c
src/configfile.c
src/types.db
src/varnish.c
src/write_riemann.c