Code

Merge branch 'collectd-5.6'
authorFlorian Forster <octo@collectd.org>
Thu, 8 Sep 2016 06:11:42 +0000 (08:11 +0200)
committerFlorian Forster <octo@collectd.org>
Thu, 8 Sep 2016 06:11:42 +0000 (08:11 +0200)
1  2 
src/types.db

diff --cc src/types.db
Simple merge