Code

Merge branch 'ff/innodb'
authorFlorian Forster <octo@collectd.org>
Fri, 8 Aug 2014 19:20:52 +0000 (21:20 +0200)
committerFlorian Forster <octo@collectd.org>
Fri, 8 Aug 2014 19:20:52 +0000 (21:20 +0200)
1  2 
src/collectd.conf.in
src/types.db

Simple merge
diff --cc src/types.db
Simple merge