Code

Merge branch 'ef/mic'
authorFlorian Forster <octo@collectd.org>
Tue, 21 May 2013 12:51:22 +0000 (14:51 +0200)
committerFlorian Forster <octo@collectd.org>
Tue, 21 May 2013 12:51:22 +0000 (14:51 +0200)
1  2 
AUTHORS
README
configure.in
src/Makefile.am
src/collectd.conf.in
src/collectd.conf.pod

diff --cc AUTHORS
Simple merge
diff --cc README
Simple merge
diff --cc configure.in
Simple merge
diff --cc src/Makefile.am
Simple merge
Simple merge
Simple merge