Merge branch 'ef/mic'

author Florian Forster <octo@collectd.org>

Tue, 21 May 2013 12:51:22 +0000 (14:51 +0200)

committer Florian Forster <octo@collectd.org>

Tue, 21 May 2013 12:51:22 +0000 (14:51 +0200)
author Florian Forster <octo@collectd.org>
Tue, 21 May 2013 12:51:22 +0000 (14:51 +0200)
committer Florian Forster <octo@collectd.org>
Tue, 21 May 2013 12:51:22 +0000 (14:51 +0200)
diff --cc AUTHORS
Simple merge
diff --cc README
Simple merge
diff --cc configure.in
Simple merge
diff --cc src/Makefile.am
Simple merge
diff --cc src/collectd.conf.in
Simple merge
diff --cc src/collectd.conf.pod
Simple merge
author	Florian Forster <octo@collectd.org>
	Tue, 21 May 2013 12:51:22 +0000 (14:51 +0200)
committer	Florian Forster <octo@collectd.org>
	Tue, 21 May 2013 12:51:22 +0000 (14:51 +0200)
		1	2
AUTHORS	patch \|	diff1 \|	diff2 \|	blob \| history
README	patch \|	diff1 \|	diff2 \|	blob \| history
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.pod	patch \|	diff1 \|	diff2 \|	blob \| history