Merge branch 'collectd-5.1' into collectd-5.2
authorFlorian Forster <octo@collectd.org>
Mon, 14 Jan 2013 09:53:21 +0000 (10:53 +0100)
committerFlorian Forster <octo@collectd.org>
Mon, 14 Jan 2013 09:53:21 +0000 (10:53 +0100)
1  2 
src/types.db

diff --cc src/types.db
Simple merge