Merge branch 'ff/innodb'

author Florian Forster <octo@collectd.org>

Fri, 8 Aug 2014 19:20:52 +0000 (21:20 +0200)

committer Florian Forster <octo@collectd.org>

Fri, 8 Aug 2014 19:20:52 +0000 (21:20 +0200)
author Florian Forster <octo@collectd.org>
Fri, 8 Aug 2014 19:20:52 +0000 (21:20 +0200)
committer Florian Forster <octo@collectd.org>
Fri, 8 Aug 2014 19:20:52 +0000 (21:20 +0200)
diff --cc src/collectd.conf.in
Simple merge
diff --cc src/types.db
Simple merge
author	Florian Forster <octo@collectd.org>
	Fri, 8 Aug 2014 19:20:52 +0000 (21:20 +0200)
committer	Florian Forster <octo@collectd.org>
	Fri, 8 Aug 2014 19:20:52 +0000 (21:20 +0200)
		1	2
src/collectd.conf.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/types.db	patch \|	diff1 \|	diff2 \|	blob \| history